Bug 1519862 - Close windows after test finishes rather than before next test, r=ato
authorJames Graham <james@hoppipolla.co.uk>
Wed, 09 Jan 2019 10:42:32 +0000
changeset 515066 2c82daad929ff69c6ff3115a35918487b30b89a8
parent 515065 a1544d1ae5be112f87dde5c4702549299c6caf5d
child 515067 8d89fc8ca162adb6e45bd4ecf8fbbe7a697365b9
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato
bugs1519862
milestone66.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 1519862 - Close windows after test finishes rather than before next test, r=ato This means that if closing the windows is problematic it affects the status of the current test not the next one. Differential Revision: https://phabricator.services.mozilla.com/D16831
testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -712,16 +712,21 @@ class MarionetteTestharnessExecutor(Test
                 self.script_resume % format_map, async=True)
             if result is None:
                 # This can happen if we get an content process crash
                 return None
             done, rv = handler(result)
             if done:
                 break
 
+        try:
+            self.protocol.testharness.close_old_windows(protocol)
+        except Exception:
+            pass
+
         if self.protocol.coverage.is_enabled:
             self.protocol.coverage.dump()
 
         return rv
 
 
 class MarionetteRefTestExecutor(RefTestExecutor):
     def __init__(self, browser, server_config, timeout_multiplier=1,