Enable OS State for Mambo Environment

Let's enable OS State if asked by user for Mambo simulator environment, so that we can run OS tests, have verified using buildroot environment and works fine. Signed-off-by: Satheesh Rajendran <[email protected]>
open-power · Nov 28, 2019 · e2e8cb0 · e2e8cb0
1 parent 13c3a87
commit e2e8cb0
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/common/OpTestSystem.py b/common/OpTestSystem.py
@@ -361,11 +361,11 @@ def goto_state(self, state):
         # if user overrides from command line and machine not at desired state can lead to exceptions
         self.block_setup_term = 1  # block in case the system is not on/up
         self.target_state = state  # used in WaitForIt
-        if (isinstance(self.console, OpTestQemu.QemuConsole)
-                or isinstance(self.console, OpTestMambo.MamboConsole)) \
-                and (state == OpSystemState.OS):
+        if isinstance(self.console, OpTestQemu.QemuConsole) and state == OpSystemState.OS:
             raise unittest.SkipTest(
-                "OpTestSystem running QEMU/Mambo so skipping OpSystemState.OS test")
+                "OpTestSystem running QEMU so skipping OpSystemState.OS test")
+        if isinstance(self.console, OpTestMambo.MamboConsole) and state == OpSystemState.OS:
+            self.state = OpSystemState.OS
         if isinstance(self.console, OpTestHMC.HMCConsole) \
                 and state in [OpSystemState.IPLing, OpSystemState.PETITBOOT, OpSystemState.PETITBOOT_SHELL]:
             raise unittest.SkipTest(