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

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

Issue 23093014: reformat run-webkit-tests --driver-logging output to show ctrl chars. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@eof_crlf
Patch Set: Created 7 years, 4 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
« no previous file with comments | « Tools/Scripts/webkitpy/layout_tests/port/server_process_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 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 return 787 return
788 788
789 options, parsed_args = parse_args(['--verbose', '--fully-parallel', '--c hild-processes', '2', 'passes/text.html', 'passes/image.html'], tests_included=T rue, print_nothing=False) 789 options, parsed_args = parse_args(['--verbose', '--fully-parallel', '--c hild-processes', '2', 'passes/text.html', 'passes/image.html'], tests_included=T rue, print_nothing=False)
790 host = MockHost() 790 host = MockHost()
791 port_obj = host.port_factory.get(port_name=options.platform, options=opt ions) 791 port_obj = host.port_factory.get(port_name=options.platform, options=opt ions)
792 logging_stream = StringIO.StringIO() 792 logging_stream = StringIO.StringIO()
793 run_webkit_tests.run(port_obj, options, parsed_args, logging_stream=logg ing_stream) 793 run_webkit_tests.run(port_obj, options, parsed_args, logging_stream=logg ing_stream)
794 self.assertTrue('text.html passed' in logging_stream.getvalue()) 794 self.assertTrue('text.html passed' in logging_stream.getvalue())
795 self.assertTrue('image.html passed' in logging_stream.getvalue()) 795 self.assertTrue('image.html passed' in logging_stream.getvalue())
796 796
797 def disabled_test_driver_logging(self):
798 # FIXME: Figure out how to either use a mock-test port to
799 # get output or mack mock ports work again.
800 host = Host()
801 _, err, _ = logging_run(['--platform', 'mock-win', '--driver-logging', ' fast/harness/results.html'],
802 tests_included=True, host=host)
803 self.assertTrue('OUT:' in err.getvalue())
797 804
798 class EndToEndTest(unittest.TestCase): 805 class EndToEndTest(unittest.TestCase):
799 def test_reftest_with_two_notrefs(self): 806 def test_reftest_with_two_notrefs(self):
800 # Test that we update expectations in place. If the expectation 807 # Test that we update expectations in place. If the expectation
801 # is missing, update the expected generic location. 808 # is missing, update the expected generic location.
802 host = MockHost() 809 host = MockHost()
803 _, _, _ = logging_run(['--no-show-results', 'reftests/foo/'], tests_incl uded=True, host=host) 810 _, _, _ = logging_run(['--no-show-results', 'reftests/foo/'], tests_incl uded=True, host=host)
804 file_list = host.filesystem.written_files.keys() 811 file_list = host.filesystem.written_files.keys()
805 812
806 json_string = host.filesystem.read_text_file('/tmp/layout-test-results/f ailing_results.json') 813 json_string = host.filesystem.read_text_file('/tmp/layout-test-results/f ailing_results.json')
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 977
971 run_webkit_tests.run = successful_run 978 run_webkit_tests.run = successful_run
972 res = run_webkit_tests.main(['--platform', 'test'], stdout, stderr) 979 res = run_webkit_tests.main(['--platform', 'test'], stdout, stderr)
973 self.assertEqual(res, -1) 980 self.assertEqual(res, -1)
974 981
975 run_webkit_tests.run = exception_raising_run 982 run_webkit_tests.run = exception_raising_run
976 res = run_webkit_tests.main([], stdout, stderr) 983 res = run_webkit_tests.main([], stdout, stderr)
977 self.assertEqual(res, run_webkit_tests.EXCEPTIONAL_EXIT_STATUS) 984 self.assertEqual(res, run_webkit_tests.EXCEPTIONAL_EXIT_STATUS)
978 finally: 985 finally:
979 run_webkit_tests.run = orig_run_fn 986 run_webkit_tests.run = orig_run_fn
OLDNEW
« no previous file with comments | « Tools/Scripts/webkitpy/layout_tests/port/server_process_unittest.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698