From 9985831fc43347ccde0976a7a1b61717ac8ed994 Mon Sep 17 00:00:00 2001 From: AutomatedTester Date: Fri, 20 Feb 2015 20:59:19 +0000 Subject: [PATCH 1/2] Update marionette imports for errors to handle to new marionette package --- wptrunner/executors/executormarionette.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/wptrunner/executors/executormarionette.py b/wptrunner/executors/executormarionette.py index 663f95f7ee4b3a..3738f375747ba0 100644 --- a/wptrunner/executors/executormarionette.py +++ b/wptrunner/executors/executormarionette.py @@ -30,10 +30,13 @@ def do_delayed_imports(): global marionette + global errors try: import marionette + from marionette import errors except ImportError: - import marionette_driver.marionette as marionette + from marionette_driver import marionette + from marionette_driver import errors class MarionetteTestExecutor(TestExecutor): @@ -153,13 +156,13 @@ def timeout_func(): try: self.marionette.set_script_timeout((timeout + extra_timeout) * 1000) - except IOError, marionette.errors.InvalidResponseException: + except IOError, errors.InvalidResponseException: self.logger.error("Lost marionette connection before starting test") return Stop try: result = self.convert_result(test, self.do_test(test, timeout)) - except marionette.errors.ScriptTimeoutException: + except errors.ScriptTimeoutException: with result_lock: if not result_flag.is_set(): result_flag.set() @@ -179,7 +182,7 @@ def timeout_func(): # else: # break # Now need to check if the browser is still responsive and restart it if not - except (socket.timeout, marionette.errors.InvalidResponseException, IOError): + except (socket.timeout, errors.InvalidResponseException, IOError): # This can happen on a crash # Also, should check after the test if the firefox process is still running # and otherwise ignore any other result and set it to crash @@ -250,7 +253,7 @@ def do_test(self, test, timeout): full_url = urlparse.urljoin(self.http_server_url, url) try: self.marionette.navigate(full_url) - except marionette.errors.MarionetteException: + except errors.MarionetteException: return {"status": "ERROR", "message": "Failed to load url %s" % (full_url,)} if url_type == "test": From b7bb88a5ceebf37a0ea82c7e3299a3c0eecc932f Mon Sep 17 00:00:00 2001 From: AutomatedTester Date: Fri, 20 Feb 2015 22:19:10 +0000 Subject: [PATCH 2/2] Update after comments --- wptrunner/executors/executormarionette.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wptrunner/executors/executormarionette.py b/wptrunner/executors/executormarionette.py index 3738f375747ba0..1d03ef6d1eca70 100644 --- a/wptrunner/executors/executormarionette.py +++ b/wptrunner/executors/executormarionette.py @@ -35,8 +35,7 @@ def do_delayed_imports(): import marionette from marionette import errors except ImportError: - from marionette_driver import marionette - from marionette_driver import errors + from marionette_driver import marionette, errors class MarionetteTestExecutor(TestExecutor):