Title: [139778] trunk/Tools
- Revision
- 139778
- Author
- dpra...@chromium.org
- Date
- 2013-01-15 13:04:09 -0800 (Tue, 15 Jan 2013)
Log Message
nrwt: change the default # of locked shards on chromium_win to 1
https://bugs.webkit.org/show_bug.cgi?id=106938
Reviewed by Eric Seidel.
It looks like LigHTTPd might be buggy or unstable if we are
running multiple http tests in parallel; see
http://code.google.com/p/chromium/issues/detail?id=169530 for more
context as well. This change will stop running http tests in parallel
and we can see if this fixes things.
* Scripts/webkitpy/layout_tests/port/chromium_win.py:
(ChromiumWinPort.default_max_locked_shards):
* Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
(ChromiumWinTest.test_path_to_image_diff):
(ChromiumWinTest):
(ChromiumWinTest.test_default_max_locked_shards):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (139777 => 139778)
--- trunk/Tools/ChangeLog 2013-01-15 20:57:59 UTC (rev 139777)
+++ trunk/Tools/ChangeLog 2013-01-15 21:04:09 UTC (rev 139778)
@@ -1,3 +1,23 @@
+2013-01-15 Dirk Pranke <dpra...@chromium.org>
+
+ nrwt: change the default # of locked shards on chromium_win to 1
+ https://bugs.webkit.org/show_bug.cgi?id=106938
+
+ Reviewed by Eric Seidel.
+
+ It looks like LigHTTPd might be buggy or unstable if we are
+ running multiple http tests in parallel; see
+ http://code.google.com/p/chromium/issues/detail?id=169530 for more
+ context as well. This change will stop running http tests in parallel
+ and we can see if this fixes things.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_win.py:
+ (ChromiumWinPort.default_max_locked_shards):
+ * Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
+ (ChromiumWinTest.test_path_to_image_diff):
+ (ChromiumWinTest):
+ (ChromiumWinTest.test_default_max_locked_shards):
+
2013-01-15 Jochen Eisinger <joc...@chromium.org>
[chromium] move WebDatabase related methods to TestRunner library
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py (139777 => 139778)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2013-01-15 20:57:59 UTC (rev 139777)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2013-01-15 21:04:09 UTC (rev 139778)
@@ -115,6 +115,11 @@
path = filename[len(self.layout_tests_dir()) + 1:]
return path.replace('\\', '/')
+ def default_max_locked_shards(self):
+ # FIXME: lighttpd may be unstable with > 1 concurrent shards. See
+ # http://code.google.com/p/chromium/issues/detail?id=169530
+ return 1
+
#
# PROTECTED ROUTINES
#
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py (139777 => 139778)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2013-01-15 20:57:59 UTC (rev 139777)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2013-01-15 21:04:09 UTC (rev 139778)
@@ -131,3 +131,11 @@
def test_path_to_image_diff(self):
self.assertEqual(self.make_port()._path_to_image_diff(), '/mock-checkout/out/Release/ImageDiff.exe')
+
+ def test_default_max_locked_shards(self):
+ # FIXME: Remove this test when we remove the override for default_max_locked_shards() in chromium_win.py
+ port = self.make_port()
+ port.default_child_processes = lambda: 16
+ self.assertEqual(port.default_max_locked_shards(), 1)
+ port.default_child_processes = lambda: 2
+ self.assertEqual(port.default_max_locked_shards(), 1)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
