Modified: trunk/Tools/ChangeLog (88069 => 88070)
--- trunk/Tools/ChangeLog 2011-06-03 22:22:16 UTC (rev 88069)
+++ trunk/Tools/ChangeLog 2011-06-03 22:34:21 UTC (rev 88070)
@@ -1,3 +1,13 @@
+2011-06-03 Dirk Pranke <[email protected]>
+
+ 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 <[email protected]>
Try to fix the build failure on the GTK+ 32-bit Release bot.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py (88069 => 88070)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py 2011-06-03 22:22:16 UTC (rev 88069)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py 2011-06-03 22:34:21 UTC (rev 88070)
@@ -677,7 +677,7 @@
_log.debug('Waiting for worker %d to exit' % worker_state.number)
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:
_log.info("Interrupted, exiting")
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py (88069 => 88070)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py 2011-06-03 22:22:16 UTC (rev 88069)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py 2011-06-03 22:34:21 UTC (rev 88070)
@@ -102,7 +102,7 @@
except:
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()
stack_utils.log_traceback(_log.debug, exception_traceback)
@@ -111,6 +111,7 @@
(exception_type, exception_value, None))
self._worker_connection.post_message('done')
self.cleanup()
+ _log.debug("%s exiting" % self._name)
def handle_test_list(self, src, list_name, test_list):
if list_name == "tests_to_http_lock":
@@ -126,8 +127,7 @@
elapsed_time = time.time() - start_time
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):
self._done = True
@@ -145,13 +145,12 @@
self.clean_up_after_test(test_input, result)
def cleanup(self):
- _log.debug("cleaning up")
+ _log.debug("%s cleaning up" % self._name)
self.kill_driver()
self.stop_servers_with_lock()
if self._tests_run_file:
self._tests_run_file.close()
self._tests_run_file = None
- _log.debug("done cleaning up")
def timeout(self, test_input):
"""Compute the appropriate timeout value for a test."""
