Bug 1497166 [wpt PR 13417] - Ignore "runner_teardown" messages in `TestRunnerManager.cleanup()`, a=testonly
authorPhilip Jägenstedt <philip@foolip.org>
Thu, 11 Oct 2018 09:31:41 +0000
changeset 499486 e8201978a4abad1f4c8606ddad2b53d8cc2dc8ea
parent 499485 97dedc2880cb23bf939a685ea1cfd41cb1a32806
child 499487 c1b374a8deaf00ab2c25e5af0dd6e10338f5c75c
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1497166, 13417, 13409, 13407
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1497166 [wpt PR 13417] - Ignore "runner_teardown" messages in `TestRunnerManager.cleanup()`, a=testonly Automatic update from web-platform-testsIgnore "runner_teardown" messages in `TestRunnerManager.cleanup()` This is an alternative to https://github.com/web-platform-tests/wpt/pull/13409, which adds more handling around this rather than removing it. Fixes https://github.com/web-platform-tests/wpt/issues/13407. -- wpt-commits: 300f8e2c89abc98917b40e95c14f2edf1d354f99 wpt-pr: 13417
testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py
@@ -711,16 +711,21 @@ class TestRunnerManager(threading.Thread
         while True:
             try:
                 cmd, data = self.command_queue.get_nowait()
             except Empty:
                 break
             else:
                 if cmd == "log":
                     self.log(*data)
+                elif cmd == "runner_teardown":
+                    # It's OK for the "runner_teardown" message to be left in
+                    # the queue during cleanup, as we will already have tried
+                    # to stop the TestRunner in `stop_runner`.
+                    pass
                 else:
                     self.logger.warning("Command left in command_queue during cleanup: %r, %r" % (cmd, data))
         while True:
             try:
                 cmd, data = self.remote_queue.get_nowait()
                 self.logger.warning("Command left in remote_queue during cleanup: %r, %r" % (cmd, data))
             except Empty:
                 break