| 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 76adb6a905df993aeffadc401f8f21addaa55634..a0027fd93134f541ba92b2635be08d9d8f3aebf3 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
|
| @@ -353,10 +353,24 @@ class RunTest(unittest.TestCase, StreamTestingMixin):
|
| self.assertEqual(sorted(tests_to_run), sorted(tests_run))
|
|
|
| def test_random_daily_seed_order(self):
|
| - tests_to_run = ['passes/audio.html', 'failures/expected/text.html',
|
| - 'failures/expected/missing_text.html', 'passes/args.html']
|
| - tests_run = get_tests_run(['--order=random-seeded'] + tests_to_run)
|
| - self.assertEqual(sorted(tests_to_run), sorted(tests_run))
|
| + tests_to_run = [
|
| + 'failures/expected/text.html',
|
| + 'passes/args.html',
|
| + 'passes/audio.html',
|
| + 'failures/expected/missing_text.html',
|
| + ]
|
| + tests_run = get_tests_run(['--order=random-seeded'] + sorted(tests_to_run))
|
| + self.assertEqual(tests_to_run, tests_run)
|
| +
|
| + def test_random_daily_seed_order_with_value(self):
|
| + tests_to_run = [
|
| + 'failures/expected/missing_text.html',
|
| + 'failures/expected/text.html',
|
| + 'passes/audio.html',
|
| + 'passes/args.html',
|
| + ]
|
| + tests_run = get_tests_run(['--order=random-seeded=5'] + sorted(tests_to_run))
|
| + self.assertEqual(tests_to_run, tests_run)
|
|
|
| def test_random_order_test_specified_multiple_times(self):
|
| tests_to_run = ['passes/args.html', 'passes/audio.html', 'passes/audio.html', 'passes/args.html']
|
| @@ -1037,7 +1051,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), 9)
|
| + self.assertEqual(len(file_list), 10)
|
| self.assertBaselines(file_list, "passes/image", [".txt", ".png"], err)
|
| self.assertBaselines(file_list, "failures/expected/missing_image", [".txt", ".png"], err)
|
|
|
| @@ -1052,7 +1066,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), 11)
|
| + self.assertEqual(len(file_list), 12)
|
| 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)
|
| @@ -1078,7 +1092,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), 8)
|
| + self.assertEqual(len(file_list), 9)
|
| 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))
|
| @@ -1104,7 +1118,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), 12)
|
| + self.assertEqual(len(file_list), 13)
|
| 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)
|
| @@ -1118,7 +1132,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), 9)
|
| + self.assertEqual(len(file_list), 10)
|
| self.assertBaselines(file_list,
|
| "platform/test-mac-mac10.10/passes/image", [".txt", ".png"], err)
|
| self.assertBaselines(file_list,
|
| @@ -1131,7 +1145,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), 5)
|
| + self.assertEqual(len(file_list), 6)
|
| self.assertBaselines(file_list, '', [], err)
|
|
|
| host.filesystem.write_text_file(test.LAYOUT_TEST_DIR + '/passes/reftest-expected.txt', '')
|
| @@ -1139,7 +1153,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, 'passes/reftest', ['.txt'], err)
|
|
|
| def test_reftest_new_baseline(self):
|
| @@ -1149,7 +1163,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), 5)
|
| + self.assertEqual(len(file_list), 6)
|
| self.assertBaselines(file_list, '', [], err)
|
|
|
| host.filesystem.write_text_file(test.LAYOUT_TEST_DIR + '/passes/reftest-expected.txt', '')
|
| @@ -1157,7 +1171,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, 'platform/test-mac-mac10.10/passes/reftest', ['.txt'], err)
|
|
|
|
|
|
|