[LNT] r321160 - [LNT] Provide a way to reliably point to results page

[Leandro Nunes via llvm-commits]

Author: leandron
Date: Wed Dec 20 02:25:45 2017
New Revision: 321160

URL: http://llvm.org/viewvc/llvm-project?rev=321160&view=rev
Log:
[LNT] Provide a way to reliably point to results page

Makes the database ID to be reused when submitting data for an existing order with "--merge replace".

https://reviews.llvm.org/D41115


Modified:
    lnt/trunk/lnt/server/db/testsuitedb.py
    lnt/trunk/tests/lnttool/submit.shtest
    lnt/trunk/tests/server/db/CreateV4TestSuiteInstance.py
    lnt/trunk/tests/server/ui/change_processing.py

Modified: lnt/trunk/lnt/server/db/testsuitedb.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/db/testsuitedb.py?rev=321160&r1=321159&r2=321160&view=diff
==============================================================================
--- lnt/trunk/lnt/server/db/testsuitedb.py (original)
+++ lnt/trunk/lnt/server/db/testsuitedb.py Wed Dec 20 02:25:45 2017
@@ -363,8 +363,8 @@ class TestSuiteDB(object):
 
                 class_dict[iname] = item.column = make_run_column(iname)
 
-            def __init__(self, machine, order, start_time, end_time):
-                self.id = None
+            def __init__(self, new_id, machine, order, start_time, end_time):
+                self.id = new_id
                 self.machine = machine
                 self.order = order
                 self.start_time = start_time
@@ -962,6 +962,7 @@ class TestSuiteDB(object):
 
         # Find the order record.
         order = self._getOrCreateOrder(session, run_parameters)
+        new_id = None
 
         if merge != 'append':
             existing_runs = session.query(self.Run) \
@@ -977,6 +978,10 @@ class TestSuiteDB(object):
                         logger.info("Duplicate submission for order %r: "
                                     "deleting previous run %r" %
                                     (order, previous_run))
+
+                        # Keep the latest ID so the URL is still valid on replace
+                        new_id = previous_run.id
+
                         session.delete(previous_run)
                 else:
                     raise ValueError('Invalid Run mergeStrategy %r' % merge)
@@ -996,7 +1001,7 @@ class TestSuiteDB(object):
                                                   "%Y-%m-%d %H:%M:%S")
         run_parameters.pop('end_time')
 
-        run = self.Run(machine, order, start_time, end_time)
+        run = self.Run(new_id, machine, order, start_time, end_time)
 
         # First, extract all of the specified run fields.
         for item in self.run_fields:

Modified: lnt/trunk/tests/lnttool/submit.shtest
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/lnttool/submit.shtest?rev=321160&r1=321159&r2=321160&view=diff
==============================================================================
--- lnt/trunk/tests/lnttool/submit.shtest (original)
+++ lnt/trunk/tests/lnttool/submit.shtest Wed Dec 20 02:25:45 2017
@@ -36,6 +36,11 @@ lnt submit "http://localhost:9091/db_def
 # RUN: FileCheck %s --check-prefix=CHECK-SUBMIT0 < %t.tmp/submit0.txt
 # CHECK-SUBMIT0: http://localhost:9091/db_default/v4/nts/4
 
+# Submit sample-report1.json again and check it keeps the same URL
+lnt submit "http://localhost:9091/db_default/submitRun" --commit=1 "${SHARED_INPUTS}/sample-report1.json" > "${OUTPUT_DIR}/submit0-resubmit.txt"
+# RUN: FileCheck %s --check-prefix=CHECK-RESUBMIT0 < %t.tmp/submit0-resubmit.txt
+# CHECK-RESUBMIT0: http://localhost:9091/db_default/v4/nts/4
+
 lnt submit "http://localhost:9091/db_default/submitRun" --commit 1 "${SHARED_INPUTS}/sample-report2.json" > "${OUTPUT_DIR}/submit1.txt"
 # RUN: FileCheck %s --check-prefix=CHECK-SUBMIT1 < %t.tmp/submit1.txt
 # CHECK-SUBMIT1: http://localhost:9091/db_default/v4/nts/5

Modified: lnt/trunk/tests/server/db/CreateV4TestSuiteInstance.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/db/CreateV4TestSuiteInstance.py?rev=321160&r1=321159&r2=321160&view=diff
==============================================================================
--- lnt/trunk/tests/server/db/CreateV4TestSuiteInstance.py (original)
+++ lnt/trunk/tests/server/db/CreateV4TestSuiteInstance.py Wed Dec 20 02:25:45 2017
@@ -36,7 +36,7 @@ order3 = ts_db.Order()
 order3.llvm_project_revision = "1236"
 
 
-run = ts_db.Run(machine, order, start_time, end_time)
+run = ts_db.Run(None, machine, order, start_time, end_time)
 test = ts_db.Test("test-a")
 
 sample = ts_db.Sample(run, test, compile_time=1.0, score=4.2, code_size=100)

Modified: lnt/trunk/tests/server/ui/change_processing.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/ui/change_processing.py?rev=321160&r1=321159&r2=321160&view=diff
==============================================================================
--- lnt/trunk/tests/server/ui/change_processing.py (original)
+++ lnt/trunk/tests/server/ui/change_processing.py Wed Dec 20 02:25:45 2017
@@ -60,11 +60,11 @@ class ChangeProcessingTests(unittest.Tes
         test2 = self.test2 = ts_db.Test("bar")
         session.add(test2)
 
-        run = self.run = ts_db.Run(machine, order1235, start_time,
+        run = self.run = ts_db.Run(None, machine, order1235, start_time,
                                    end_time)
         session.add(run)
 
-        run2 = self.run2 = ts_db.Run(machine2, order1235, start_time,
+        run2 = self.run2 = ts_db.Run(None, machine2, order1235, start_time,
                                      end_time)
         session.add(run2)