tor-browser

commit 1d896cc495ce8a9d0e143c6a64d3adb58c2494fd
parent c0a396340134e1807d0bd1e27b86473fb610d319
Author: Florian Quèze <florian@queze.net>
Date:   Tue, 21 Oct 2025 20:35:27 +0000

Bug 1995593 - don't retry self tests that are expected to fail, r=jmaher.

Differential Revision: https://phabricator.services.mozilla.com/D269432

Diffstat:
M
testing/xpcshell/runxpcshelltests.py
 | 
4
++++
M
testing/xpcshell/selftest.py
 | 
3
+++

2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py
@@ -2186,6 +2186,10 @@ class XPCShellTests:
             "profiler": self.profiler,
         }
 
+        # Only set retry if explicitly provided (avoid overriding default behavior)
+        if options.get("retry") is not None:
+            kwargs["retry"] = options.get("retry")
+
         if self.sequential:
             # Allow user to kill hung xpcshell subprocess with SIGINT
             # when we are only running tests sequentially.
diff --git a/testing/xpcshell/selftest.py b/testing/xpcshell/selftest.py
@@ -546,6 +546,9 @@ prefs = [
         kwargs["testingModulesDir"] = self.testing_modules
         kwargs["utility_path"] = self.utility_path
         kwargs["repeat"] = 0
+        # Don't retry tests that are expected to fail
+        if not expected:
+            kwargs["retry"] = False
 
         startup_profiling = os.environ.pop("MOZ_PROFILER_STARTUP", None)
         try: