tor-browser

commit 8dde5c06b580ddc77c8507b884a6239665b1af91
parent 601d93eaf22b1e30156f1e9262b2c2de3d6964ee
Author: Ben Hearsum <ben@mozilla.com>
Date:   Thu, 27 Nov 2025 21:36:39 +0000

Bug 2002681: refactor mozharness action skipping r=releng-reviewers,ahal

This paves the way for recording how long each action takes, while allowing us to easily ignore skipped actions.

This causes no change in behaviour as there's only one caller of `run_action`, and the logic being moved now runs directly before the call.

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

Diffstat:
M
testing/mozharness/mozharness/base/script.py
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/testing/mozharness/mozharness/base/script.py b/testing/mozharness/mozharness/base/script.py
@@ -2282,10 +2282,6 @@ class BaseScript(ScriptMixin, LogMixin):
             self.error("No such method %s!" % method_name)
 
     def run_action(self, action):
-        if action not in self.actions:
-            self.action_message("Skipping %s step." % action)
-            return
-
         method_name = action.replace("-", "_")
         self.action_message("Running %s step." % action)
 
@@ -2391,6 +2387,10 @@ class BaseScript(ScriptMixin, LogMixin):
         self.dump_config()
         try:
             for action in self.all_actions:
+                if action not in self.actions:
+                    self.action_message(f"Skipping {action} step.")
+                    continue
+
                 self.run_action(action)
         except Exception:
             self.fatal("Uncaught exception: %s" % traceback.format_exc())