Title: [108413] trunk/Tools
Revision
108413
Author
[email protected]
Date
2012-02-21 16:29:33 -0800 (Tue, 21 Feb 2012)

Log Message

nrwt: make the delay between starting workers configurable per-port
https://bugs.webkit.org/show_bug.cgi?id=79148

Reviewed by Eric Seidel.

Because of bug 79147, we have to sleep a bit in between starting
DRTs; however, doing so across the board slows down the Test
port. Making this configurable shaves 10 seconds off of
run_webkit_tests_integrationtest.py

* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager._run_tests):
* Scripts/webkitpy/layout_tests/port/base.py:
(Port.worker_startup_delay_secs):
* Scripts/webkitpy/layout_tests/port/test.py:
(TestPort.worker_startup_delay_secs):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (108412 => 108413)


--- trunk/Tools/ChangeLog	2012-02-22 00:19:26 UTC (rev 108412)
+++ trunk/Tools/ChangeLog	2012-02-22 00:29:33 UTC (rev 108413)
@@ -1,3 +1,22 @@
+2012-02-21  Dirk Pranke  <[email protected]>
+
+        nrwt: make the delay between starting workers configurable per-port
+        https://bugs.webkit.org/show_bug.cgi?id=79148
+
+        Reviewed by Eric Seidel.
+
+        Because of bug 79147, we have to sleep a bit in between starting
+        DRTs; however, doing so across the board slows down the Test
+        port. Making this configurable shaves 10 seconds off of
+        run_webkit_tests_integrationtest.py
+        
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager._run_tests):
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        (Port.worker_startup_delay_secs):
+        * Scripts/webkitpy/layout_tests/port/test.py:
+        (TestPort.worker_startup_delay_secs):
+
 2012-02-21  Jon Lee  <[email protected]>
 
         Bring notifications support to WK1 mac

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (108412 => 108413)


--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py	2012-02-22 00:19:26 UTC (rev 108412)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py	2012-02-22 00:29:33 UTC (rev 108413)
@@ -774,11 +774,7 @@
             worker_state = _WorkerState(worker_number, worker_connection)
             self._worker_states[worker_connection.name()] = worker_state
 
-            # FIXME: If we start workers up too quickly, DumpRenderTree appears
-            # to thrash on something and time out its first few tests. Until
-            # we can figure out what's going on, sleep a bit in between
-            # workers. This needs a bug filed.
-            time.sleep(0.1)
+            time.sleep(self._port.worker_startup_delay_secs())
 
         self._printer.print_update("Starting testing ...")
         for shard in all_shards:

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (108412 => 108413)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py	2012-02-22 00:19:26 UTC (rev 108412)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py	2012-02-22 00:29:33 UTC (rev 108413)
@@ -169,6 +169,13 @@
     def default_worker_model(self):
         return 'processes'
 
+    def worker_startup_delay_secs(self):
+        # FIXME: If we start workers up too quickly, DumpRenderTree appears
+        # to thrash on something and time out its first few tests. Until
+        # we can figure out what's going on, sleep a bit in between
+        # workers. See https://bugs.webkit.org/show_bug.cgi?id=79147 .
+        return 0.1
+
     def baseline_path(self):
         """Return the absolute path to the directory to store new baselines in for this port."""
         baseline_search_paths = self.get_option('additional_platform_directory', []) + self.baseline_search_path()

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py (108412 => 108413)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py	2012-02-22 00:19:26 UTC (rev 108412)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py	2012-02-22 00:29:33 UTC (rev 108413)
@@ -371,6 +371,9 @@
     def default_worker_model(self):
         return 'inline'
 
+    def worker_startup_delay_secs(self):
+        return 0
+
     def check_build(self, needs_http):
         return True
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to