[LNT] r256296 - Fix regression tests I broke

[Chris Matthews via llvm-commits]

Author: cmatthews
Date: Tue Dec 22 17:13:26 2015
New Revision: 256296

URL: http://llvm.org/viewvc/llvm-project?rev=256296&view=rev
Log:
Fix regression tests I broke

Modified:
    lnt/trunk/lnt/server/ui/templates/v4_graph.html
    lnt/trunk/lnt/server/ui/views.py
    lnt/trunk/tests/server/ui/test_api.py

Modified: lnt/trunk/lnt/server/ui/templates/v4_graph.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_graph.html?rev=256296&r1=256295&r2=256296&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_graph.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_graph.html Tue Dec 22 17:13:26 2015
@@ -40,7 +40,7 @@
 {% block javascript %}
 var g = {};
 var test_suite_name = "{{ request.view_args.testsuite_name }}";
-var db_name = "{{ request.view_args.db_name }}";
+var db_name = "{{ request.view_args.get('db_name','') }}";
 var graph_plots = {{graph_plots|tojson|safe}};
 var baseline_plots = {{baseline_plots|tojson|safe}};
 

Modified: lnt/trunk/lnt/server/ui/views.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/views.py?rev=256296&r1=256295&r2=256296&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/views.py (original)
+++ lnt/trunk/lnt/server/ui/views.py Tue Dec 22 17:13:26 2015
@@ -691,7 +691,7 @@ def v4_graph():
         test_name = 'Geometric Mean'
 
         col = (0,0,0)
-        legend.append((machine, test_name, field.name, col))
+        legend.append((machine, test_name, field.name, col, None))
 
         q = ts.query(sqlalchemy.sql.func.min(field.column),
                 ts.Order.llvm_project_revision,
@@ -897,7 +897,8 @@ def v4_graph():
             new_entry = {'name': machine.name,
                          'test': test,
                          'unit': unit,
-                         'color': util.toColorString(color),}
+                         'color': util.toColorString(color),
+                         'url': None}
             simple_type_legend.append(new_entry)
         json_obj['legend'] = simple_type_legend
         json_obj['revision_range'] = revision_range

Modified: lnt/trunk/tests/server/ui/test_api.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/ui/test_api.py?rev=256296&r1=256295&r2=256296&view=diff
==============================================================================
--- lnt/trunk/tests/server/ui/test_api.py (original)
+++ lnt/trunk/tests/server/ui/test_api.py Tue Dec 22 17:13:26 2015
@@ -62,9 +62,9 @@ order_expected_response = {u'id': 1,
                            u'previous_order_id': 2}
 
 graph_data = [[u'152292', 1.0,
-               {u'date': u'2012-05-01 16:28:23', u'label': u'152292'}],
+               {u'date': u'2012-05-01 16:28:23', u'label': u'152292', u'runID': u'5'}],
               [u'152293', 10.0,
-               {u'date': u'2012-05-03 16:28:24', u'label': u'152293'}]]
+               {u'date': u'2012-05-03 16:28:24', u'label': u'152293', u'runID': u'6'}]]
 
 
 class JSONAPITester(unittest.TestCase):