Changeset 278762 in webkit

Timestamp:

Jun 11, 2021, 8:34:23 AM (5 years ago)

Author:

Jonathan Bedard

Message:

REGRESSION (r278454): [run-webkit-tests] worker is printed twice for each test in debug logging
​https://bugs.webkit.org/show_bug.cgi?id=226895
<rdar://problem/79164077>

Reviewed by Dewei Zhu.

• Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:

(Worker.run_tests): Strip process names from debug logs.
(Worker.stop): Ditto.
(Worker._kill_driver): Ditto.
(Worker._clean_up_after_test): Ditto.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-06-11  Jonathan Bedard  <jbedard@apple.com>
+
+        REGRESSION (r278454): [run-webkit-tests] worker is printed twice for each test in debug logging
+        https://bugs.webkit.org/show_bug.cgi?id=226895
+        <rdar://problem/79164077>
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:
+        (Worker.run_tests): Strip process names from debug logs.
+        (Worker.stop): Ditto.
+        (Worker._kill_driver): Ditto.
+        (Worker._clean_up_after_test): Ditto.
+
 2021-06-10  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -313 +313 @@
             Worker.instance.run_test(input, shard.name)
 
-        _log.debug('{} finished test group'.format(TaskPool.Process.name))
+        _log.debug('finished test group')
 
         if self._driver and self._driver.has_crashed():
@@ -365 +365 @@
 
     def stop(self):
-        _log.debug('{} cleaning up'.format(TaskPool.Process.name))
+        _log.debug('cleaning up')
         self._kill_driver()
 
@@ -390 +390 @@
         self._driver = None
         if driver:
-            _log.debug('{} killing driver'.format(TaskPool.Process.name))
+            _log.debug('killing driver')
             driver.stop()
 
@@ -409 +409 @@
 
             # Print the error message(s).
-            _log.debug('{} {} failed:'.format(TaskPool.Process.name, test_name))
+            _log.debug('{} failed:'.format(test_name))
             for f in result.failures:
-                _log.debug('{}  {}'.format(TaskPool.Process.name, f.message()))
+                _log.debug('{}'.format(f.message()))
         elif result.type == test_expectations.SKIP:
-            _log.debug('{} {} skipped'.format(TaskPool.Process.name, test_name))
+            _log.debug('{} skipped'.format(test_name))
         else:
-            _log.debug("{} {} passed".format(TaskPool.Process.name, test_name))
+            _log.debug("{} passed".format(test_name))
 
     def _run_test_in_another_thread(self, test_input, thread_timeout_sec, stop_when_done):