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

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

Issue 23503087: Make the MockDRT implementation work again and add support for --actuals. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: clean up arg parsing in mock_drt.parse_options() Created 7 years, 3 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/port/mock_drt_unittest.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 944 matching lines...) Expand 10 before | Expand all | Expand 10 after
955 "platform/test-mac-leopard/failures/expected/missing_image", [".txt" , ".png"], err) 955 "platform/test-mac-leopard/failures/expected/missing_image", [".txt" , ".png"], err)
956 956
957 957
958 class PortTest(unittest.TestCase): 958 class PortTest(unittest.TestCase):
959 def assert_mock_port_works(self, port_name, args=[]): 959 def assert_mock_port_works(self, port_name, args=[]):
960 self.assertTrue(passing_run(args + ['--platform', 'mock-' + port_name, ' fast/harness/results.html'], tests_included=True, host=Host())) 960 self.assertTrue(passing_run(args + ['--platform', 'mock-' + port_name, ' fast/harness/results.html'], tests_included=True, host=Host()))
961 961
962 def disabled_test_mac_lion(self): 962 def disabled_test_mac_lion(self):
963 self.assert_mock_port_works('mac-lion') 963 self.assert_mock_port_works('mac-lion')
964 964
965 def disabled_test_mac_lion_in_test_shell_mode(self):
966 self.assert_mock_port_works('mac-lion', args=['--additional-drt-flag=--t est-shell'])
967
968 def disabled_test_qt_linux(self):
969 self.assert_mock_port_works('qt-linux')
970
971 def disabled_test_mac_lion(self):
972 self.assert_mock_port_works('mac-lion')
973
974 965
975 class MainTest(unittest.TestCase): 966 class MainTest(unittest.TestCase):
976 def test_exception_handling(self): 967 def test_exception_handling(self):
977 orig_run_fn = run_webkit_tests.run 968 orig_run_fn = run_webkit_tests.run
978 969
979 # unused args pylint: disable=W0613 970 # unused args pylint: disable=W0613
980 def interrupting_run(port, options, args, stderr): 971 def interrupting_run(port, options, args, stderr):
981 raise KeyboardInterrupt 972 raise KeyboardInterrupt
982 973
983 def successful_run(port, options, args, stderr): 974 def successful_run(port, options, args, stderr):
(...skipping 15 matching lines...) Expand all
999 990
1000 run_webkit_tests.run = successful_run 991 run_webkit_tests.run = successful_run
1001 res = run_webkit_tests.main(['--platform', 'test'], stdout, stderr) 992 res = run_webkit_tests.main(['--platform', 'test'], stdout, stderr)
1002 self.assertEqual(res, -1) 993 self.assertEqual(res, -1)
1003 994
1004 run_webkit_tests.run = exception_raising_run 995 run_webkit_tests.run = exception_raising_run
1005 res = run_webkit_tests.main([], stdout, stderr) 996 res = run_webkit_tests.main([], stdout, stderr)
1006 self.assertEqual(res, run_webkit_tests.EXCEPTIONAL_EXIT_STATUS) 997 self.assertEqual(res, run_webkit_tests.EXCEPTIONAL_EXIT_STATUS)
1007 finally: 998 finally:
1008 run_webkit_tests.run = orig_run_fn 999 run_webkit_tests.run = orig_run_fn
OLDNEW
« no previous file with comments | « Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698