yarn: Move --no-act logic out of .run_scenario

2 files changed, 23 insertions, 13 deletions

diff --git a/yarn b/yarn
index 47ef754..15b279a 100755
--- a/yarn
+++ b/yarn
@@ -32,6 +32,16 @@ import cmdtestlib
 import yarnlib
 
 
+def dry_scenario_runner_factory(info, ts):
+    class DryScenarioRunner(yarnlib.ScenarioRunner):
+        def run_scenario(self, scenario, datadir, homedir):
+            info('Pretending everything went OK')
+            for step in scenario.steps:
+                ts['current_step'] = step
+            return True
+    return DryScenarioRunner
+
+
 class YarnRunner(cliapp.Application):
 
     def add_settings(self):
@@ -143,10 +153,16 @@ class YarnRunner(cliapp.Application):
         self.steps_run = 0
         self.timings = []
 
-        scenario_runner = yarnlib.ScenarioRunner(shell_prelude, os.getcwd(),
-                                                 self.parse_env(),
-                                                 pre_step_cb=self.pre_step,
-                                                 post_step_cb=self.post_step)
+        if self.settings['no-act']:
+            runner_class = dry_scenario_runner_factory(self.info, self.ts)
+        else:
+            runner_class = yarnlib.ScenarioRunner
+        scenario_runner = runner_class(shell_prelude, os.getcwd(),
+                                       self.parse_env(),
+                                       pre_step_cb=self.pre_step,
+                                       post_step_cb=self.post_step,
+                                       pre_scenario_cb=self.pre_scenario,
+                                       post_scenario_cb=self.post_scenario)
 
         start_time = time.time()
         failed_scenarios = []
@@ -242,15 +258,7 @@ class YarnRunner(cliapp.Application):
         os.mkdir(homedir)
 
         ud = self.pre_scenario(scenario, datadir, homedir)
-
-        if self.settings['no-act']:
-            self.info('Pretending everything went OK')
-            for step in scenario.steps:
-                self.ts['current_step'] = step
-            ok = True
-        else:
-            ok = scenario_runner.run_scenario(scenario, datadir, homedir)
-
+        ok = scenario_runner.run_scenario(scenario, datadir, homedir)
         self.post_scenario(scenario, datadir, homedir, ud)
 
         return ok
diff --git a/yarnlib/scenario_runner.py b/yarnlib/scenario_runner.py
index e0cdf62..28172e4 100644
--- a/yarnlib/scenario_runner.py
+++ b/yarnlib/scenario_runner.py
@@ -101,6 +101,8 @@ class ScenarioRunner(object):
 
     def __init__(self, shell_prelude, srcdir, extra_env=(),
                  pre_step_cb=default_pre_step, post_step_cb=default_post_step,
+                 pre_scenario_cb=lambda *x: None,
+                 post_scenario_cb=lambda *x: None,
                  cmdrunner=cliapp.runcmd_unchecked):
         self.shell_prelude = shell_prelude
         self.srcdir = srcdir