Bug 1541041 Page timeouts are ignored during cold page-load test suites r=rwood,davehunt

bebef1987 · bebef1987 · commit 70d07476cb08 · 2019-05-08T18:29:56.000Z
Differential Revision: https://phabricator.services.mozilla.com/D26309 --HG-- extra : moz-landing-system : lando
diff --git a/testing/raptor/raptor/raptor.py b/testing/raptor/raptor/raptor.py
@@ -334,7 +334,8 @@ def wait_for_test_finish(self, test, timeout):
         # convert timeout to seconds and account for page cycles
         timeout = int(timeout / 1000) * int(test.get('page_cycles', 1))
         # account for the pause the raptor webext runner takes after browser startup
-        timeout += (int(self.post_startup_delay / 1000) + 3)
+        # and the time an exception is propagated through the framework
+        timeout += (int(self.post_startup_delay / 1000) + 10)
 
         # if geckoProfile enabled, give browser more time for profiling
         if self.config['gecko_profile'] is True:
@@ -865,6 +866,10 @@ def run_test_cold(self, test, timeout=None):
                 self.log.info("* debug-mode enabled - please shutdown the browser manually...")
                 self.runner.wait(timeout=None)
 
+            # break test execution if a exception is present
+            if len(self.results_handler.page_timeout_list) > 0:
+                break
+
     def run_test_warm(self, test, timeout=None):
         self.log.info("test %s is running in warm mode; browser will NOT be restarted between "
                       "page cycles" % test['name'])
