[LNT] r343504 - Fix fallout caused by YAML files ordering.

[Martin Liska via llvm-commits]

Author: marxin
Date: Mon Oct  1 10:21:52 2018
New Revision: 343504

URL: http://llvm.org/viewvc/llvm-project?rev=343504&view=rev
Log:
Fix fallout caused by YAML files ordering.

Differential Revision: https://reviews.llvm.org/D52723

Modified:
    lnt/trunk/tests/server/ui/V4Pages.py
    lnt/trunk/tests/server/ui/test_api.py
    lnt/trunk/tests/server/ui/test_matrix_page.py

Modified: lnt/trunk/tests/server/ui/V4Pages.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/ui/V4Pages.py?rev=343504&r1=343503&r2=343504&view=diff
==============================================================================
--- lnt/trunk/tests/server/ui/V4Pages.py (original)
+++ lnt/trunk/tests/server/ui/V4Pages.py Mon Oct  1 10:21:52 2018
@@ -451,9 +451,9 @@ def main():
                          ["", "machine2", "FAIL", "-", "PASS", ""]])
     check_table_links(result_table_20120504,
                       [[],
-                       ["/db_default/v4/nts/graph?plot.0=2.4.3&highlight_run=6"],
+                       ["/db_default/v4/nts/graph?plot.0=2.4.2&highlight_run=6"],
                        [],
-                       ["/db_default/v4/nts/graph?plot.0=2.5.3&highlight_run=6"]])
+                       ["/db_default/v4/nts/graph?plot.0=2.5.2&highlight_run=6"]])
 
     check_body_nr_tests_table(
         client, '/v4/nts/daily_report/2012/5/04',
@@ -474,13 +474,13 @@ def main():
                          ["", "machine2", "1.000", '-', '20.00%', ""], ])
     check_table_links(result_table_20120513,
                       [[],
-                       ['/db_default/v4/nts/graph?plot.0=2.6.3&highlight_run=9'],
+                       ['/db_default/v4/nts/graph?plot.0=2.6.2&highlight_run=9'],
                        [],
-                       ['/db_default/v4/nts/graph?plot.0=2.7.3&highlight_run=9'],
+                       ['/db_default/v4/nts/graph?plot.0=2.7.2&highlight_run=9'],
                        [],
-                       ['/db_default/v4/nts/graph?plot.0=2.8.3&highlight_run=9'],
+                       ['/db_default/v4/nts/graph?plot.0=2.8.2&highlight_run=9'],
                        [],
-                       ['/db_default/v4/nts/graph?plot.0=2.9.3&highlight_run=9']])
+                       ['/db_default/v4/nts/graph?plot.0=2.9.2&highlight_run=9']])
 
     sparkline_test6_xml = \
         get_sparkline(result_table_20120513, "test6", "machine2")
@@ -649,7 +649,7 @@ def main():
     # Check we can convert a sample into a graph page.
     graph_to_sample = check_code(client, '/db_default/v4/nts/graph_for_sample/10/compile_time?foo=bar',
                                  expected_code=HTTP_REDIRECT)
-    assert graph_to_sample.headers['Location'] == "http://localhost/db_default/v4/nts/graph?foo=bar&plot.0=2.6.2"
+    assert graph_to_sample.headers['Location'] == "http://localhost/db_default/v4/nts/graph?foo=bar&plot.0=2.6.0"
 
     # Check that is we ask for a sample or invalid field, we explode with 400s.
     check_code(client, '/db_default/v4/nts/graph_for_sample/10000/compile_time?foo=bar',

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=343504&r1=343503&r2=343504&view=diff
==============================================================================
--- lnt/trunk/tests/server/ui/test_api.py (original)
+++ lnt/trunk/tests/server/ui/test_api.py Mon Oct  1 10:21:52 2018
@@ -199,13 +199,13 @@ class JSONAPITester(unittest.TestCase):
         """Check that /graph/x/y/z returns what we expect."""
         client = self.client
 
-        j = check_json(client, 'api/db_default/v4/nts/graph/2/4/3')
+        j = check_json(client, 'api/db_default/v4/nts/graph/2/4/2')
         # TODO: Graph API needs redesign to be well formed.
         # self._check_response_is_well_formed(j)
         self.assertEqual(graph_data, j)
 
         # Now check that limit works.
-        j2 = check_json(client, 'api/db_default/v4/nts/graph/2/4/3?limit=1')
+        j2 = check_json(client, 'api/db_default/v4/nts/graph/2/4/2?limit=1')
         # self._check_response_is_well_formed(j)
         self.assertEqual(graph_data2, j2)
 
@@ -255,7 +255,7 @@ class JSONAPITester(unittest.TestCase):
         # check first field
         f0 = fields[0]
         self.assertEqual(0, f0['column_id'])
-        self.assertEqual('compile_status', f0['column_name'])
+        self.assertEqual('compile_time', f0['column_name'])
 
     def test_tests_api(self):
         """Tests API."""

Modified: lnt/trunk/tests/server/ui/test_matrix_page.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/ui/test_matrix_page.py?rev=343504&r1=343503&r2=343504&view=diff
==============================================================================
--- lnt/trunk/tests/server/ui/test_matrix_page.py (original)
+++ lnt/trunk/tests/server/ui/test_matrix_page.py Mon Oct  1 10:21:52 2018
@@ -59,7 +59,7 @@ class MatrixViewTester(unittest.TestCase
         """Does the page load with the data as expected.
         """
         client = self.client
-        reply = check_html(client, '/v4/nts/matrix?plot.0=2.6.3')
+        reply = check_html(client, '/v4/nts/matrix?plot.0=2.6.2')
         # Set a baseline and run again.
         form_data = dict(name="foo_baseline",
                          description="foo_description",
@@ -69,13 +69,13 @@ class MatrixViewTester(unittest.TestCase
         check_code(client, '/v4/nts/set_baseline/1',
                    expected_code=HTTP_REDIRECT)
 
-        reply = check_html(client, '/v4/nts/matrix?plot.0=2.6.3')
+        reply = check_html(client, '/v4/nts/matrix?plot.0=2.6.2')
         # Make sure the data is in the page.
         self.assertIn("test6", reply.data)
         self.assertIn("1.0000", reply.data)
         self.assertIn("1.2000", reply.data)
 
-        reply = check_html(client, '/v4/nts/matrix?plot.0=2.6.3&limit=1')
+        reply = check_html(client, '/v4/nts/matrix?plot.0=2.6.2&limit=1')
 
 
 if __name__ == '__main__':