Changeset 99907 in webkit

Timestamp:

Nov 10, 2011 3:31:45 PM (13 years ago)

Author:

tony@chromium.org

Message:

Lazily start DRT instances in NRWT
​https://bugs.webkit.org/show_bug.cgi?id=72038

Reviewed by Eric Seidel.

Just a refactoring, no new tests.

• Scripts/webkitpy/layout_tests/controllers/worker.py:
• Scripts/webkitpy/layout_tests/port/chromium.py:
• Scripts/webkitpy/layout_tests/port/dryrun.py:
• Scripts/webkitpy/layout_tests/port/test.py:
• Scripts/webkitpy/layout_tests/port/webkit.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/worker.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/port/dryrun.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/test.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-10  Tony Chang  <tony@chromium.org>
+
+        Lazily start DRT instances in NRWT
+        https://bugs.webkit.org/show_bug.cgi?id=72038
+
+        Reviewed by Eric Seidel.
+
+        Just a refactoring, no new tests.
+
+        * Scripts/webkitpy/layout_tests/controllers/worker.py:
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * Scripts/webkitpy/layout_tests/port/dryrun.py:
+        * Scripts/webkitpy/layout_tests/port/test.py:
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+
 2011-11-10  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/controllers/worker.py

@@ -206 +206 @@
 
         driver = self._port.create_driver(self._worker_number)
-        driver.start()
 
         class SingleTestThread(threading.Thread):
@@ -247 +246 @@
         if not self._driver or self._driver.poll() is not None:
             self._driver = self._port.create_driver(self._worker_number)
-            self._driver.start()
         return self.run_single_test(self._driver, test_input)
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py

@@ -449 +449 @@
         return cmd
 
-    def start(self):
+    def _start(self):
         assert not self._proc
         # FIXME: This should use ServerProcess like WebKitDriver does.
@@ -511 +511 @@
 
     def run_test(self, driver_input):
+        if not self._proc:
+            self._start()
+
         output = []
         error = []
@@ -524 +527 @@
         uri = self._port.test_to_uri(driver_input.test_name)
         cmd = self._test_shell_command(uri, driver_input.timeout, driver_input.image_hash)
-        (line, crash) = self._write_command_and_read_line(input=cmd)
+        line, crash = self._write_command_and_read_line(input=cmd)
 
         while not crash and line.rstrip() != "#EOF":
@@ -566 +569 @@
                 error.append(line)
 
-            (line, crash) = self._write_command_and_read_line(input=None)
+            line, crash = self._write_command_and_read_line(input=None)
 
         run_time = time.time() - start_time

trunk/Tools/Scripts/webkitpy/layout_tests/port/dryrun.py

@@ -135 +135 @@
         return DriverOutput(text, image, checksum, audio, crash=False, test_time=time.time() - start_time, timeout=False, error='')
 
-    def start(self):
-        pass
-
     def stop(self):
         pass

trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py

@@ -510 +510 @@
             test_time=time.time() - start_time, timeout=test.timeout, error=test.error)
 
-    def start(self):
-        pass
-
     def stop(self):
         pass

trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py

@@ -456 +456 @@
         self.error_from_test = str()
         self.err_seen_eof = False
+        self._server_process = None
 
 
@@ -480 +481 @@
         return cmd
 
-    def start(self):
+    def _start(self):
         server_name = self._port.driver_name()
         environment = self._port.setup_environ_for_server(server_name)
@@ -541 +542 @@
 
     def run_test(self, driver_input):
+        if not self._server_process:
+            self._start()
         self.error_from_test = str()
         self.err_seen_eof = False