dispatcher: allow requesting a step without insisting.

Introduces Dispatcher.request_steps_gently() which requests steps if they
are not skipped already (i.e. "Unless there is a compelling reason, like a
kickstart command, not to run this step, it must be run.").

Resolves: rhbz#723798

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/pyanaconda_test/dispatch_test.py b/tests/pyanaconda_test/dispatch_test.py
index c84427ac4..57de69250 100644
--- a/tests/pyanaconda_test/dispatch_test.py
+++ b/tests/pyanaconda_test/dispatch_test.py
@@ -171,6 +171,18 @@ class DispatchTest(mock.TestCase):
         self.assertFalse(d.step_enabled("complete"))
         self.assertTrue(d.step_enabled("filtertype"))
 
+    def request_steps_gently_test(self):
+        from pyanaconda.errors import DispatchError
+        from pyanaconda.dispatch import Step
+        d = self._getDispatcher()
+        d.schedule_steps("betanag", "complete")
+        d.skip_steps("betanag")
+        self.assertRaises(DispatchError, d.request_steps, "betanag")
+        d.request_steps_gently("betanag")
+        d.request_steps_gently("complete")
+        self.assertEqual(d.steps["betanag"].sched, Step.SCHED_SKIPPED)
+        self.assertEqual(d.steps["complete"].sched, Step.SCHED_REQUESTED)
+
     def track_scheduling_test(self):
         from pyanaconda.dispatch import Step
         d = self._getDispatcher()