Changeset 88070 in webkit

Timestamp:

Jun 3, 2011 3:34:21 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-06-03 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Ojan Vafai.

new-run-webkit-tests: minor logging, code cleanup
​https://bugs.webkit.org/show_bug.cgi?id=62055

• Scripts/webkitpy/layout_tests/layout_package/manager.py:
• Scripts/webkitpy/layout_tests/layout_package/worker.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/manager.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/worker.py (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-03  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        new-run-webkit-tests: minor logging, code cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=62055
+
+        * Scripts/webkitpy/layout_tests/layout_package/manager.py:
+        * Scripts/webkitpy/layout_tests/layout_package/worker.py:
+
 2011-06-03  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py

@@ -678 +678 @@
                     worker_state.worker_connection.join(5.0)
                     if worker_state.worker_connection.is_alive():
-                        _log.error('Worked %d did not exit in time.' % worker_state.number)
+                        _log.error('Worker %d did not exit in time.' % worker_state.number)
 
         except KeyboardInterrupt:

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

@@ -103 +103 @@
             exception_msg = ", exception raised"
         finally:
-            _log.debug("%s done%s" % (self._name, exception_msg))
+            _log.debug("%s done with message loop%s" % (self._name, exception_msg))
             if exception_msg:
                 exception_type, exception_value, exception_traceback = sys.exc_info()
@@ -112 +112 @@
             self._worker_connection.post_message('done')
             self.cleanup()
+            _log.debug("%s exiting" % self._name)
 
     def handle_test_list(self, src, list_name, test_list):
@@ -127 +128 @@
         self._worker_connection.post_message('finished_list', list_name, num_tests, elapsed_time)
 
-        if self._has_http_lock:
-            self.stop_servers_with_lock()
+        self.stop_servers_with_lock()
 
     def handle_stop(self, src):
@@ -146 +146 @@
 
     def cleanup(self):
-        _log.debug("cleaning up")
+        _log.debug("%s cleaning up" % self._name)
         self.kill_driver()
         self.stop_servers_with_lock()
@@ -152 +152 @@
             self._tests_run_file.close()
             self._tests_run_file = None
-        _log.debug("done cleaning up")
 
     def timeout(self, test_input):