Title: [100511] trunk/Tools
- Revision
- 100511
- Author
- t...@chromium.org
- Date
- 2011-11-16 14:53:24 -0800 (Wed, 16 Nov 2011)
Log Message
[NRWT] speculative fix for multiple subprocess test on cygwin
https://bugs.webkit.org/show_bug.cgi?id=72518
Reviewed by Adam Barth.
* Scripts/webkitpy/layout_tests/port/chromium.py: cygwin probably
tries to emulate posix fd behavior.
* Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (100510 => 100511)
--- trunk/Tools/ChangeLog 2011-11-16 22:46:31 UTC (rev 100510)
+++ trunk/Tools/ChangeLog 2011-11-16 22:53:24 UTC (rev 100511)
@@ -1,3 +1,14 @@
+2011-11-16 Tony Chang <t...@chromium.org>
+
+ [NRWT] speculative fix for multiple subprocess test on cygwin
+ https://bugs.webkit.org/show_bug.cgi?id=72518
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/layout_tests/port/chromium.py: cygwin probably
+ tries to emulate posix fd behavior.
+ * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+
2011-11-16 Dirk Pranke <dpra...@chromium.org>
Run a dummy test in the gpu configurations if there's nothing to do.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (100510 => 100511)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-11-16 22:46:31 UTC (rev 100510)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-11-16 22:53:24 UTC (rev 100511)
@@ -451,7 +451,7 @@
assert not self._proc
# FIXME: This should use ServerProcess like WebKitDriver does.
# FIXME: We should be reading stderr and stdout separately like how WebKitDriver does.
- close_fds = sys.platform not in ('win32', 'cygwin')
+ close_fds = sys.platform != 'win32'
self._proc = subprocess.Popen(self.cmd_line(), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=close_fds)
def has_crashed(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py (100510 => 100511)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py 2011-11-16 22:46:31 UTC (rev 100510)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py 2011-11-16 22:53:24 UTC (rev 100511)
@@ -137,9 +137,7 @@
start_time = time.time()
driver1.stop()
driver2.stop()
- # FIXME: This test is timing out it cygwin. Disable until we get a chance to debug.
- if sys.platform != 'cygwin':
- self.assertTrue(time.time() - start_time < 20)
+ self.assertTrue(time.time() - start_time < 20)
class ChromiumPortTest(port_testcase.PortTestCase):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
