Adding upstream version 125.0.1.upstream/125.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 22 insertions, 14 deletions

diff --git a/testing/raptor/raptor/perftest.py b/testing/raptor/raptor/perftest.py
index eb46e351af..6e21b6d114 100644
--- a/testing/raptor/raptor/perftest.py
+++ b/testing/raptor/raptor/perftest.py
@@ -90,7 +90,7 @@ class Perftest(object):
         live_sites=False,
         is_release_build=False,
         debug_mode=False,
-        post_startup_delay=POST_DELAY_DEFAULT,
+        post_startup_delay=None,
         interrupt_handler=None,
         e10s=True,
         results_handler_class=RaptorResultsHandler,
@@ -110,6 +110,7 @@ class Perftest(object):
         benchmark_revision=None,
         benchmark_branch=None,
         clean=False,
+        screenshot_on_failure=False,
         **kwargs
     ):
         self._remote_test_root = None
@@ -156,6 +157,7 @@ class Perftest(object):
             "benchmark_revision": benchmark_revision,
             "benchmark_branch": benchmark_branch,
             "clean": clean,
+            "screenshot_on_failure": screenshot_on_failure,
         }
 
         self.firefox_android_apps = FIREFOX_ANDROID_APPS
@@ -213,22 +215,28 @@ class Perftest(object):
         self.run_local = self.config["run_local"]
         self.debug_mode = debug_mode if self.run_local else False
 
-        # For the post startup delay, we want to max it to 1s when using the
-        # conditioned profiles.
-        if self.config.get("conditioned_profile"):
-            self.post_startup_delay = min(post_startup_delay, POST_DELAY_CONDPROF)
-        elif (
-            self.debug_mode
-        ):  # if running debug-mode reduce the pause after browser startup
-            self.post_startup_delay = min(post_startup_delay, POST_DELAY_DEBUG)
+        if post_startup_delay is None:
+            # For the post startup delay, we want to max it to 1s when using the
+            # conditioned profiles.
+            if self.config.get("conditioned_profile"):
+                self.post_startup_delay = POST_DELAY_CONDPROF
+            elif (
+                self.debug_mode
+            ):  # if running debug-mode reduce the pause after browser startup
+                self.post_startup_delay = POST_DELAY_DEBUG
+            else:
+                self.post_startup_delay = POST_DELAY_DEFAULT
+
+            if (
+                app in CHROME_ANDROID_APPS + FIREFOX_ANDROID_APPS
+                and not self.config.get("conditioned_profile")
+            ):
+                LOG.info("Mobile non-conditioned profile")
+                self.post_startup_delay = POST_DELAY_MOBILE
         else:
+            # User supplied a custom post_startup_delay value
             self.post_startup_delay = post_startup_delay
 
-        if app in CHROME_ANDROID_APPS + FIREFOX_ANDROID_APPS and not self.config.get(
-            "conditioned_profile"
-        ):
-            LOG.info("Mobile non-conditioned profile")
-            self.post_startup_delay = POST_DELAY_MOBILE
         LOG.info("Post startup delay set to %d ms" % self.post_startup_delay)
         LOG.info("main raptor init, config is: %s" % str(self.config))