split off _do_one in wizard

Author: dwhswenson

paths_cli/tests/wizard/test_wizard.py

@@ -197,7 +197,7 @@ def test_storage_description_line(self, count):
         assert line == expected
 
     def test_save_to_file(self):
-        pass
+        pytest.skip()
 
     @pytest.mark.parametrize('req,count,expected', [
         (('cvs', 1, 1), 0, (True, True)),
@@ -222,5 +222,8 @@ def test_ask_do_another(self, inputs, expected):
         if len(inputs) > 1:
             assert "Sorry" in console.log_text
 
+    def test_do_one(self):
+        pytest.skip()
+
     def test_run_wizard(self):
-        pass
+        pytest.skip()

paths_cli/wizard/wizard.py

@@ -242,6 +242,22 @@ def _ask_do_another(self, obj_type):
                 self.bad_input("Sorry, I didn't understand that.")
         return do_another
 
+    def _do_one(self, step, req):
+        try:
+            obj = step.func(self)
+        except RestartObjectException:
+            self.say("Okay, let's try that again.")
+            return True
+        self.register(obj, step.display_name, step.store_name)
+        requires_another, allows_another = self._req_do_another(req)
+        if requires_another:
+            do_another = True
+        elif not requires_another and allows_another:
+            do_another = self._ask_do_another(step.display_name)
+        else:
+            do_another = False
+        return do_another
+
     def run_wizard(self):
         self.start("Hi! I'm the OpenPathSampling Wizard.")
         # TODO: next line is only temporary
@@ -251,20 +267,7 @@ def run_wizard(self):
             req = step.store_name, step.minimum, step.maximum
             do_another = True
             while do_another:
-                try:
-                    obj = step.func(self)
-                except RestartObjectException:
-                    self.say("Okay, let's try that again.")
-                    continue
-                self.register(obj, step.display_name, step.store_name)
-                requires_another, allows_another = self._req_do_another(req)
-                if requires_another:
-                    do_another = True
-                elif not requires_another and allows_another:
-                    do_another = self._ask_do_another(step.display_name)
-                else:
-                    do_another = False
-
+                do_another = self._do_one(step, req)
         storage = self.get_storage()
         self.save_to_file(storage)