Unreviewed, test-webkitpy fix after r111642.

* Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
(ChromiumDriverTest.setUp):
(ChromiumDriverTest.test_two_drivers):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111662 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 2ec4bd0676534a3e0db205613f62b37007bb8cd5..537a80272f99c964b52dc9a664983d78dbe8a05c 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-22  Philippe Normand  <pnormand@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  <ossy@webkit.org>
 
         webkitpy: clean up actually getting crash logs from DRT/WTR crashes

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
index d3d311c48765b97375a4d9b70aa4b3238a53b504..4d263bda809de37b17eafce3faf18eadb5ab55dd 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
@@ -52,6 +52,7 @@ from webkitpy.layout_tests.port.driver import DriverInput
 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 @@ class ChromiumDriverTest(unittest.TestCase):
 
         # 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()