Changeset 76398 in webkit
- Timestamp:
- Jan 21, 2011 3:23:49 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r76362 r76398 1 2011-01-21 Dirk Pranke <dpranke@chromium.org> 2 3 Reviewed by Eric Seidel. 4 5 Suppress a few remaining integration tests so that none of the 6 layout_test unit tests ever read from the filesystem or launch 7 subprocesses that aren't part of the unit tests. 8 9 Also fix a minor bug in the printing unit tests that was 10 incorrectly relying on sys.argv. 11 12 https://bugs.webkit.org/show_bug.cgi?id=52863 13 14 * Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py: 15 * Scripts/webkitpy/layout_tests/port/port_testcase.py: 16 * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py: 17 1 18 2011-01-21 Darin Adler <darin@apple.com> 2 19 -
trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py
r76288 r76398 115 115 def get_printer(self, args=None, single_threaded=False, 116 116 is_fully_parallel=False): 117 args = args or [] 117 118 printing_options = printing.print_options() 118 119 option_parser = optparse.OptionParser(option_list=printing_options) -
trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
r76326 r76398 58 58 port.stop_http_server() 59 59 60 def test_image_diff(self):60 def disabled_test_image_diff(self): 61 61 port = self.make_port() 62 62 if not port: -
trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
r76321 r76398 99 99 100 100 101 def logging_run(extra_args=None, port_obj=None, tests_included=False, filesystem=None):101 def logging_run(extra_args=None, port_obj=None, record_results=False, tests_included=False, filesystem=None): 102 102 options, parsed_args = parse_args(extra_args=extra_args, 103 record_results= False,103 record_results=record_results, 104 104 tests_included=tests_included, 105 105 print_nothing=False) … … 241 241 def test_last_results(self): 242 242 fs = port.unit_test_filesystem() 243 passing_run(['--clobber-old-results'], record_results=True, filesystem=fs) 243 # We do a logging run here instead of a passing run in order to 244 # suppress the output from the json generator. 245 (res, buildbot_output, regular_output, user) = logging_run(['--clobber-old-results'], record_results=True, filesystem=fs) 244 246 (res, buildbot_output, regular_output, user) = logging_run( 245 247 ['--print-last-failures'], filesystem=fs) … … 520 522 # requires fcntl, so it can't be tested on win32, etc. There is 521 523 # probably a better way of handling this. 522 def test_darwin(self):524 def disabled_test_darwin(self): 523 525 if sys.platform != "darwin": 524 526 return 525 527 526 self.assertTrue(passing_run(['--platform', 'test'])) 527 self.assertTrue(passing_run(['--platform', 'dryrun', 528 'fast/html'])) 529 self.assertTrue(passing_run(['--platform', 'dryrun-mac', 530 'fast/html'])) 528 self.assertTrue(passing_run(['--platform', 'dryrun', 'fast/html'], 529 tests_included=True)) 530 self.assertTrue(passing_run(['--platform', 'dryrun-mac', 'fast/html'], 531 tests_included=True)) 531 532 532 533 def test_test(self):
Note: See TracChangeset
for help on using the changeset viewer.