Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py

Issue 16511002: reland r151588 (remove unsupported run-webkit-tests flags) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add --chromium back in Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (C) 2010 Google Inc. All rights reserved. 1 # Copyright (C) 2010 Google Inc. All rights reserved.
2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze ged 2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze ged
3 # Copyright (C) 2011 Apple Inc. All rights reserved. 3 # Copyright (C) 2011 Apple Inc. All rights reserved.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are 6 # modification, are permitted provided that the following conditions are
7 # met: 7 # met:
8 # 8 #
9 # * Redistributions of source code must retain the above copyright 9 # * Redistributions of source code must retain the above copyright
10 # notice, this list of conditions and the following disclaimer. 10 # notice, this list of conditions and the following disclaimer.
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 def test_no_order_test_specified_multiple_times(self): 339 def test_no_order_test_specified_multiple_times(self):
340 tests_to_run = ['passes/args.html', 'passes/audio.html', 'passes/audio.h tml', 'passes/args.html'] 340 tests_to_run = ['passes/args.html', 'passes/audio.html', 'passes/audio.h tml', 'passes/args.html']
341 tests_run = get_tests_run(['--order=none'] + tests_to_run) 341 tests_run = get_tests_run(['--order=none'] + tests_to_run)
342 self.assertEqual(tests_to_run, tests_run) 342 self.assertEqual(tests_to_run, tests_run)
343 343
344 def test_no_order_with_directory_entries_in_natural_order(self): 344 def test_no_order_with_directory_entries_in_natural_order(self):
345 tests_to_run = ['http/tests/ssl', 'perf/foo', 'http/tests/passes'] 345 tests_to_run = ['http/tests/ssl', 'perf/foo', 'http/tests/passes']
346 tests_run = get_tests_run(['--order=none'] + tests_to_run) 346 tests_run = get_tests_run(['--order=none'] + tests_to_run)
347 self.assertEqual(tests_run, ['http/tests/ssl/text.html', 'perf/foo/test. html', 'http/tests/passes/image.html', 'http/tests/passes/text.html']) 347 self.assertEqual(tests_run, ['http/tests/ssl/text.html', 'perf/foo/test. html', 'http/tests/passes/image.html', 'http/tests/passes/text.html'])
348 348
349 def test_gc_between_tests(self):
350 self.assertTrue(passing_run(['--gc-between-tests']))
351
352 def test_complex_text(self):
353 self.assertTrue(passing_run(['--complex-text']))
354
355 def test_threaded(self):
356 self.assertTrue(passing_run(['--threaded']))
357
358 def test_repeat_each(self): 349 def test_repeat_each(self):
359 tests_to_run = ['passes/image.html', 'passes/text.html'] 350 tests_to_run = ['passes/image.html', 'passes/text.html']
360 tests_run = get_tests_run(['--repeat-each', '2'] + tests_to_run) 351 tests_run = get_tests_run(['--repeat-each', '2'] + tests_to_run)
361 self.assertEqual(tests_run, ['passes/image.html', 'passes/image.html', ' passes/text.html', 'passes/text.html']) 352 self.assertEqual(tests_run, ['passes/image.html', 'passes/image.html', ' passes/text.html', 'passes/text.html'])
362 353
363 def test_ignore_flag(self): 354 def test_ignore_flag(self):
364 # Note that passes/image.html is expected to be run since we specified i t directly. 355 # Note that passes/image.html is expected to be run since we specified i t directly.
365 tests_run = get_tests_run(['-i', 'passes', 'passes/image.html']) 356 tests_run = get_tests_run(['-i', 'passes', 'passes/image.html'])
366 self.assertFalse('passes/text.html' in tests_run) 357 self.assertFalse('passes/text.html' in tests_run)
367 self.assertTrue('passes/image.html' in tests_run) 358 self.assertTrue('passes/image.html' in tests_run)
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 972
982 run_webkit_tests.run = successful_run 973 run_webkit_tests.run = successful_run
983 res = run_webkit_tests.main(['--platform', 'test'], stdout, stderr) 974 res = run_webkit_tests.main(['--platform', 'test'], stdout, stderr)
984 self.assertEqual(res, -1) 975 self.assertEqual(res, -1)
985 976
986 run_webkit_tests.run = exception_raising_run 977 run_webkit_tests.run = exception_raising_run
987 res = run_webkit_tests.main([], stdout, stderr) 978 res = run_webkit_tests.main([], stdout, stderr)
988 self.assertEqual(res, run_webkit_tests.EXCEPTIONAL_EXIT_STATUS) 979 self.assertEqual(res, run_webkit_tests.EXCEPTIONAL_EXIT_STATUS)
989 finally: 980 finally:
990 run_webkit_tests.run = orig_run_fn 981 run_webkit_tests.run = orig_run_fn
OLDNEW
« no previous file with comments | « Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698