[LNT] Fix fallout caused by YAML files ordering.

[marxin]

Summary

As fields have different IDs, I caused a fallout with the patch:

http://green.lab.llvm.org/green/job/LNT_Tests/1130/

[MatzeB]

LGTM

lnt/trunk/tests/server/ui/V4Pages.py

result_table_20120504 = get_results_table(
         client, '/v4/nts/daily_report/2012/5/04', "Execution Time")
     check_table_content(result_table_20120504,
                         [["test1", ""],
                          ["", "machine2", "1.000", "-", "900.00%", ""],
                          ["test2", ""],
                          ["", "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',
         [['machine2', '2', '0', '1']])
 
     # Check that a failing result does not show up in the spark line
     # as a dot with value 0.
     result_table_20120513 = get_results_table(
         client, '/v4/nts/daily_report/2012/5/13?num_days=3', "Execution Time")
     check_table_content(result_table_20120513,
                         [["test6", ""],
                          ["", "machine2", "1.000", "FAIL", "PASS", ""],
                          ["test_hash1", ""],
                          ["", "machine2", "1.000", '-', '20.00%', ""],
                          ["test_hash2", ""],
                          ["", "machine2", "1.000", '-', '20.00%', ""],
                          ["test_mhash_on_run", ""],
                          ["", "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")
     nr_sample_points = len(extract_sample_points(sparkline_test6_xml))
     assert 2 == nr_sample_points, \
         "Expected 2 sample points, found %d" % nr_sample_points
 
     # Check that a different background color is used in the sparkline
def main():
     resp = check_code(client, '/__health')
     assert resp.data == "Ok"
     resp = check_code(client, '/ping')
     assert resp.data == "pong"
 
     # 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',
                expected_code=HTTP_NOT_FOUND)
     check_code(client, '/db_default/v4/nts/graph_for_sample/10/not_a_metric?foo=bar',
                expected_code=HTTP_BAD_REQUEST)
 
 
 if __name__ == '__main__':
     main()

lnt/trunk/tests/server/ui/test_api.py

def test_single_sample_api(self):
         self._check_response_is_well_formed(j)
         self.assertEquals(sample_expected_response, j['samples'][0])
         check_json(client, 'api/db_default/v4/nts/samples/1000', expected_code=404)
 
     def test_graph_api(self):
         """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)
 
     def test_samples_api(self):
         """Samples API."""
         client = self.client
         # Run IDs must be passed, so 400 if they are not.
         check_json(client, 'api/db_default/v4/nts/samples',
def test_fields_api(self):
         fields = j['fields']
 
         # check number of fields
         self.assertEqual(9, len(fields))
 
         # 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."""
         client = self.client
         j = check_json(client, 'api/db_default/v4/nts/tests')
 
         tests = j['tests']
 

lnt/trunk/tests/server/ui/test_matrix_page.py

def test_config_errors(self):
         reply = check_code(client, '/v4/nts/matrix?plot.0=1.1.999',
                            expected_code=HTTP_NOT_FOUND)
         self.assertIn("Invalid field", reply.data)
 
     def test_matrix_view(self):
         """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",
                          prmote=True)
         rc = client.post('/v4/nts/order/6', data=form_data)
         self.assertEquals(rc.status_code, HTTP_REDIRECT)
         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__':
     unittest.main(argv=[sys.argv[0], ])