Title: [278762] trunk/Tools
- Revision
- 278762
- Author
- jbed...@apple.com
- Date
- 2021-06-11 08:34:23 -0700 (Fri, 11 Jun 2021)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (278761 => 278762)
--- trunk/Tools/ChangeLog 2021-06-11 15:00:25 UTC (rev 278761)
+++ trunk/Tools/ChangeLog 2021-06-11 15:34:23 UTC (rev 278762)
@@ -1,3 +1,17 @@
+2021-06-11 Jonathan Bedard <jbed...@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 <achristen...@webkit.org>
Origin is null in http requests when baseURL has custom scheme on iOS 15.0
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py (278761 => 278762)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py 2021-06-11 15:00:25 UTC (rev 278761)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py 2021-06-11 15:34:23 UTC (rev 278762)
@@ -312,7 +312,7 @@
break
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():
self._kill_driver()
@@ -364,7 +364,7 @@
return additional_results
def stop(self):
- _log.debug('{} cleaning up'.format(TaskPool.Process.name))
+ _log.debug('cleaning up')
self._kill_driver()
def _timeout(self, test_input):
@@ -389,7 +389,7 @@
driver = self._driver
self._driver = None
if driver:
- _log.debug('{} killing driver'.format(TaskPool.Process.name))
+ _log.debug('killing driver')
driver.stop()
def _run_test_with_or_without_timeout(self, test_input, timeout, stop_when_done):
@@ -408,13 +408,13 @@
self._batch_count = 0
# 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):
"""Run a test in a separate thread, enforcing a hard time limit.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
