blink/run-webkit-tests: Write layout test environment to json file.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
index a0027fd93134f541ba92b2635be08d9d8f3aebf3..ebc1ff58088e89c7dfb64025aa3018cfc0bf185c 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
@@ -544,6 +544,17 @@ class RunTest(unittest.TestCase, StreamTestingMixin):
         tests_run = get_tests_run(['--no-smoke'], host=host, port_obj=port_obj)
         self.assertNotEqual(['passes/text.html'], tests_run)
 
+    def test_env_json(self):
+        os.environ['DUMMY-ENV-KEY'] = 'dummy-env-value'
+        host = MockHost()
+        details, _, _ = logging_run(['--dummy-arg=dummy-arg-value'], host=host)
+        self.assertEqual(details.exit_code, 0)
+
+        json_string = host.filesystem.read_text_file('/tmp/layout-test-results/env.json')
+        print json_string
+        self.assertTrue(json_string.find('"dummy_arg":["dummy-arg-value"]') != -1)
+        self.assertTrue(json_string.find('"DUMMY-ENV-KEY":"dummy-env-value"') != -1)

[Dirk Pranke, 2016/06/21 21:57:54]

Why not just look at the real arguments that are being passed?

[mithro, 2016/06/22 08:42:24]

I wanted an argument which had no effect on the run in any way. There doesn't
appear to be an existing "no op" argument?

[Dirk Pranke, 2016/06/23 23:57:26]

I'm not sure why it matters whether the argument has any effect or not?

+
     def test_missing_and_unexpected_results(self):
         # Test that we update expectations in place. If the expectation
         # is missing, update the expected generic location.
@@ -1051,7 +1062,7 @@ class RebaselineTest(unittest.TestCase, StreamTestingMixin):
             tests_included=True, host=host, new_results=True)
         file_list = host.filesystem.written_files.keys()
         self.assertEqual(details.exit_code, 0)
-        self.assertEqual(len(file_list), 10)
+        self.assertEqual(len(file_list), 11)
         self.assertBaselines(file_list, "passes/image", [".txt", ".png"], err)
         self.assertBaselines(file_list, "failures/expected/missing_image", [".txt", ".png"], err)
 
@@ -1066,7 +1077,7 @@ class RebaselineTest(unittest.TestCase, StreamTestingMixin):
                                       tests_included=True, host=host, new_results=True)
         file_list = host.filesystem.written_files.keys()
         self.assertEqual(details.exit_code, 3)
-        self.assertEqual(len(file_list), 12)
+        self.assertEqual(len(file_list), 13)
         self.assertBaselines(file_list, "failures/unexpected/missing_text", [".txt"], err)
         self.assertBaselines(file_list, "platform/test/failures/unexpected/missing_image", [".png"], err)
         self.assertBaselines(file_list, "platform/test/failures/unexpected/missing_render_tree_dump", [".txt"], err)
@@ -1092,7 +1103,7 @@ Bug(foo) failures/unexpected/missing_render_tree_dump.html [ Missing ]
                                       tests_included=True, host=host, new_results=True, port_obj=port)
         file_list = host.filesystem.written_files.keys()
         self.assertEqual(details.exit_code, 0)
-        self.assertEqual(len(file_list), 9)
+        self.assertEqual(len(file_list), 10)
         self.assertFalse(any('failures/unexpected/missing_text-expected' in file for file in file_list))
         self.assertFalse(any('failures/unexpected/missing_image-expected' in file for file in file_list))
         self.assertFalse(any('failures/unexpected/missing_render_tree_dump-expected' in file for file in file_list))
@@ -1118,7 +1129,7 @@ Bug(foo) failures/unexpected/missing_render_tree_dump.html [ Missing ]
                                       tests_included=True, host=host, new_results=True, port_obj=port)
         file_list = host.filesystem.written_files.keys()
         self.assertEqual(details.exit_code, 0)
-        self.assertEqual(len(file_list), 13)
+        self.assertEqual(len(file_list), 14)
         self.assertBaselines(file_list, "failures/unexpected/missing_text", [".txt"], err)
         self.assertBaselines(file_list, "failures/unexpected/missing_image", [".png"], err)
         self.assertBaselines(file_list, "failures/unexpected/missing_render_tree_dump", [".txt"], err)
@@ -1132,7 +1143,7 @@ Bug(foo) failures/unexpected/missing_render_tree_dump.html [ Missing ]
             tests_included=True, host=host, new_results=True)
         file_list = host.filesystem.written_files.keys()
         self.assertEqual(details.exit_code, 0)
-        self.assertEqual(len(file_list), 10)
+        self.assertEqual(len(file_list), 11)
         self.assertBaselines(file_list,
                              "platform/test-mac-mac10.10/passes/image", [".txt", ".png"], err)
         self.assertBaselines(file_list,
@@ -1145,7 +1156,7 @@ Bug(foo) failures/unexpected/missing_render_tree_dump.html [ Missing ]
         details, err, _ = logging_run(['--reset-results', 'passes/reftest.html'], tests_included=True, host=host)
         file_list = host.filesystem.written_files.keys()
         self.assertEqual(details.exit_code, 0)
-        self.assertEqual(len(file_list), 6)
+        self.assertEqual(len(file_list), 7)
         self.assertBaselines(file_list, '', [], err)
 
         host.filesystem.write_text_file(test.LAYOUT_TEST_DIR + '/passes/reftest-expected.txt', '')
@@ -1153,7 +1164,7 @@ Bug(foo) failures/unexpected/missing_render_tree_dump.html [ Missing ]
         details, err, _ = logging_run(['--reset-results', 'passes/reftest.html'], tests_included=True, host=host)
         file_list = host.filesystem.written_files.keys()
         self.assertEqual(details.exit_code, 0)
-        self.assertEqual(len(file_list), 7)
+        self.assertEqual(len(file_list), 8)
         self.assertBaselines(file_list, 'passes/reftest', ['.txt'], err)
 
     def test_reftest_new_baseline(self):
@@ -1163,7 +1174,7 @@ Bug(foo) failures/unexpected/missing_render_tree_dump.html [ Missing ]
         details, err, _ = logging_run(['--new-baseline', 'passes/reftest.html'], tests_included=True, host=host)
         file_list = host.filesystem.written_files.keys()
         self.assertEqual(details.exit_code, 0)
-        self.assertEqual(len(file_list), 6)
+        self.assertEqual(len(file_list), 7)
         self.assertBaselines(file_list, '', [], err)
 
         host.filesystem.write_text_file(test.LAYOUT_TEST_DIR + '/passes/reftest-expected.txt', '')
@@ -1171,7 +1182,7 @@ Bug(foo) failures/unexpected/missing_render_tree_dump.html [ Missing ]
         details, err, _ = logging_run(['--new-baseline', 'passes/reftest.html'], tests_included=True, host=host)
         file_list = host.filesystem.written_files.keys()
         self.assertEqual(details.exit_code, 0)
-        self.assertEqual(len(file_list), 7)
+        self.assertEqual(len(file_list), 8)
         self.assertBaselines(file_list, 'platform/test-mac-mac10.10/passes/reftest', ['.txt'], err)