Title: [111662] trunk/Tools
- Revision
- 111662
- Author
- ph...@webkit.org
- Date
- 2012-03-22 01:44:47 -0700 (Thu, 22 Mar 2012)
Log Message
Unreviewed, test-webkitpy fix after r111642.
* Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
(ChromiumDriverTest.setUp):
(ChromiumDriverTest.test_two_drivers):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (111661 => 111662)
--- trunk/Tools/ChangeLog 2012-03-22 08:18:39 UTC (rev 111661)
+++ trunk/Tools/ChangeLog 2012-03-22 08:44:47 UTC (rev 111662)
@@ -1,3 +1,11 @@
+2012-03-22 Philippe Normand <pnorm...@igalia.com>
+
+ Unreviewed, test-webkitpy fix after r111642.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+ (ChromiumDriverTest.setUp):
+ (ChromiumDriverTest.test_two_drivers):
+
2012-03-22 Csaba Osztrogonác <o...@webkit.org>
webkitpy: clean up actually getting crash logs from DRT/WTR crashes
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py (111661 => 111662)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py 2012-03-22 08:18:39 UTC (rev 111661)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py 2012-03-22 08:44:47 UTC (rev 111662)
@@ -52,6 +52,7 @@
class ChromiumDriverTest(unittest.TestCase):
def setUp(self):
mock_port = Mock() # FIXME: This should use a tighter mock.
+ mock_port.default_test_timeout_ms = lambda: 1000
self.driver = chromium.ChromiumDriver(mock_port, worker_number=0, pixel_tests=True)
def test_test_shell_command(self):
@@ -143,6 +144,7 @@
# get_option is used to get the timeout (ms) for a process before we kill it.
mock_port.get_option = lambda name: 60 * 1000
+ mock_port.default_test_timeout_ms = lambda: 1000
driver1 = MockDriver()
driver1._start(False, [])
driver2 = MockDriver()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
