diff --git a/tools/wptrunner/wptrunner/executors/executormarionette.py b/tools/wptrunner/wptrunner/executors/executormarionette.py index fe1fed136309ba..c1748f1ffda53e 100644 --- a/tools/wptrunner/wptrunner/executors/executormarionette.py +++ b/tools/wptrunner/wptrunner/executors/executormarionette.py @@ -275,15 +275,18 @@ def get_test_window(self, window_id, parent, timeout=5): def test_window_loaded(self): """Wait until the page in the new window has been loaded. - Hereby ignore Javascript execptions that are thrown when + Hereby ignore Javascript exceptions that are thrown when the document has been unloaded due to a process change. """ while True: try: self.parent.base.execute_script(self.window_loaded_script, asynchronous=True) break - except errors.JavascriptException: - pass + except errors.JavascriptException as e: + if e.message.startswith("Script evaluation aborted: Actor"): + # Special-case JavaScript errors for a JSWindowActor destroy + # until a decision is made on bug 1673478. + pass class MarionettePrefsProtocolPart(PrefsProtocolPart):