Changeset 84128 in webkit
- Timestamp:
- Apr 18, 2011 2:47:50 AM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r84127 r84128 1 2011-04-18 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r84111. 4 http://trac.webkit.org/changeset/84111 5 https://bugs.webkit.org/show_bug.cgi?id=58771 6 7 Chromium linux layout tests are broken. (Requested by loislo2 8 on #webkit). 9 10 * Scripts/webkitpy/layout_tests/port/chromium.py: 11 * Scripts/webkitpy/layout_tests/port/chromium_unittest.py: 12 * Scripts/webkitpy/layout_tests/port/mock_drt.py: 13 1 14 2011-04-18 Sheriff Bot <webkit.review.bot@gmail.com> 2 15 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
r84111 r84128 358 358 self._image_path = self._port._filesystem.join(self._port.results_directory(), 359 359 'png_result%s.png' % self._worker_number) 360 self._stderr_is_nonblocking = False361 360 362 361 def cmd_line(self): … … 405 404 self._proc = subprocess.Popen(cmd, stdin=subprocess.PIPE, 406 405 stdout=subprocess.PIPE, 407 stderr=subprocess. PIPE,406 stderr=subprocess.STDOUT, 408 407 close_fds=close_flag) 409 self._stderr_is_nonblocking = False410 408 411 409 def poll(self): … … 518 516 output.append(line) 519 517 else: 520 error.append( 'extra stdout output: %s' %line)518 error.append(line) 521 519 522 520 (line, crash) = self._write_command_and_read_line(input=None) … … 529 527 if not text: 530 528 text = None 531 error_text = ''.join(error) + self._read_stderr()532 529 533 530 return base.DriverOutput(text, output_image, actual_checksum, audio=None, 534 crash=crash, test_time=run_time, timeout=timeout, error= error_text)531 crash=crash, test_time=run_time, timeout=timeout, error=''.join(error)) 535 532 536 533 def stop(self): … … 556 553 self._proc.wait() 557 554 self._proc = None 558 559 def _read_stderr(self):560 if sys.platform in ('win32', 'cygwin'):561 import msvcrt562 import win32pipe563 564 fd = self._proc.stderr.fileno()565 osf = msvcrt.get_osfhandle(fd)566 _, avail, _ = win32pipe.PeekNamedPipe(osf, 0)567 if avail:568 return self._proc.stderr.read(avail)569 return ''570 else:571 if not self._stderr_is_nonblocking:572 import fcntl573 import os574 fd = self._proc.stderr.fileno()575 fl = fcntl.fcntl(fd, fcntl.F_GETFL)576 fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)577 self._stderr_is_nonblocking = True578 return self._proc.stderr.read() -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
r84111 r84128 42 42 import chromium_win 43 43 44 from webkitpy.layout_tests.port import base45 from webkitpy.layout_tests.port import factory46 44 from webkitpy.layout_tests.port import port_testcase 47 45 … … 223 221 self.assertFalse(exception_raised) 224 222 225 # Disabled because this is an integration test that relies on the226 # actual filesystem.227 def disabled_test_stderr(self):228 port = factory.get('mock-chromium-mac-snowleopard')229 path = port.abspath_for_test('fast/html/article-element.html')230 self.assertTrue(port._filesystem.exists(path))231 232 driver = port.create_driver(1)233 driver.start()234 try:235 driver_input = base.DriverInput(path, 1000, None)236 driver_output = driver.run_test(driver_input)237 self.assertEquals(driver_output.error.strip(), 'stuff going to stderr')238 finally:239 driver.stop()240 241 223 242 224 class ChromiumPortLoggingTest(logtesting.LoggingTestCase): -
trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py
r84111 r84128 284 284 self._stdout.flush() 285 285 286 # FIXME: this is a lame hack to test that we are capturing stderr287 # output correctly. We should fix this by passing in a command line288 # arg once https://bugs.webkit.org/show_bug.cgi?id=58680 lands.289 if 'article-element' in test_input.uri:290 self._stderr.write("stuff going to stderr\n")291 self._stderr.flush()292 293 286 294 287 if __name__ == '__main__':
Note: See TracChangeset
for help on using the changeset viewer.