[LNT] r312600 - Show id in {Run|Machine|Order|Test|Sample}.__repr__()

[Matthias Braun via llvm-commits]

Author: matze
Date: Tue Sep  5 17:47:48 2017
New Revision: 312600

URL: http://llvm.org/viewvc/llvm-project?rev=312600&view=rev
Log:
Show id in {Run|Machine|Order|Test|Sample}.__repr__()

Also log which fieldchanges get computed.

Modified:
    lnt/trunk/lnt/server/db/fieldchange.py
    lnt/trunk/lnt/server/db/testsuitedb.py

Modified: lnt/trunk/lnt/server/db/fieldchange.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/db/fieldchange.py?rev=312600&r1=312599&r2=312600&view=diff
==============================================================================
--- lnt/trunk/lnt/server/db/fieldchange.py (original)
+++ lnt/trunk/lnt/server/db/fieldchange.py Tue Sep  5 17:47:48 2017
@@ -61,6 +61,7 @@ def regenerate_fieldchanges_for_run(sess
     # Allow for potentially a few different runs, previous_runs, next_runs
     # all with the same order_id which we will aggregate together to make
     # our comparison result.
+    logger.info("Regenerate fieldchanges for %s run %s" % (ts, run_id))
     run = ts.getRun(session, run_id)
     runs = session.query(ts.Run). \
         filter(ts.Run.order_id == run.order_id). \

Modified: lnt/trunk/lnt/server/db/testsuitedb.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/db/testsuitedb.py?rev=312600&r1=312599&r2=312600&view=diff
==============================================================================
--- lnt/trunk/lnt/server/db/testsuitedb.py (original)
+++ lnt/trunk/lnt/server/db/testsuitedb.py Tue Sep  5 17:47:48 2017
@@ -150,11 +150,12 @@ class TestSuiteDB(object):
                 class_dict[iname] = item.column = make_machine_column(iname)
 
             def __init__(self, name_value):
+                self.id = None
                 self.name = name_value
 
             def __repr__(self):
                 return '%s_%s%r' % (db_key_name, self.__class__.__name__,
-                                    (self.name,))
+                                    (self.id, self.name))
 
             @property
             def parameters(self):
@@ -361,6 +362,7 @@ class TestSuiteDB(object):
                 class_dict[iname] = item.column = make_run_column(iname)
 
             def __init__(self, machine, order, start_time, end_time):
+                self.id = None
                 self.machine = machine
                 self.order = order
                 self.start_time = start_time
@@ -369,8 +371,8 @@ class TestSuiteDB(object):
 
             def __repr__(self):
                 return '%s_%s%r' % (db_key_name, self.__class__.__name__,
-                                    (self.machine, self.order, self.start_time,
-                                     self.end_time))
+                                    (self.id, self.machine, self.order,
+                                     self.start_time, self.end_time))
 
             @property
             def parameters(self):
@@ -412,11 +414,12 @@ class TestSuiteDB(object):
             name = Column("Name", String(256), unique=True, index=True)
 
             def __init__(self, name):
+                self.id = None
                 self.name = name
 
             def __repr__(self):
                 return '%s_%s%r' % (db_key_name, self.__class__.__name__,
-                                    (self.name,))
+                                    (self.id, self.name))
 
             def __json__(self, include_id=True):
                 result = {'name': self.name}
@@ -540,6 +543,7 @@ class TestSuiteDB(object):
                 class_dict[iname] = item.column
 
             def __init__(self, run, test, **kwargs):
+                self.id = None
                 self.run = run
                 self.test = test
 
@@ -551,9 +555,9 @@ class TestSuiteDB(object):
                 fields = dict((item.name, self.get_field(item))
                               for item in self.fields)
 
-                return '%s_%s(%r, %r, **%r)' % (
+                return '%s_%s(%r, %r, %r, **%r)' % (
                     db_key_name, self.__class__.__name__,
-                    self.run, self.test, fields)
+                    self.id, self.run, self.test, fields)
 
             def __json__(self, flatten_test=False, include_id=True):
                 result = {}