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 6, 2019 · 5a650a4 · 5a650a4
1 parent df8dbf8
commit 5a650a4
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/common/OpTestSystem.py b/common/OpTestSystem.py
@@ -362,11 +362,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):
-            raise unittest.SkipTest(
-                "OpTestSystem running QEMU/Mambo so skipping OpSystemState.OS test")
+        if state == OpSystemState.OS:
+            if (isinstance(self.console, OpTestQemu.QemuConsole)):
+                    raise unittest.SkipTest("OpTestSystem running QEMU/Mambo so skipping OpSystemState.OS test")
+            elif (isinstance(self.console, OpTestMambo.MamboConsole)):
+                self.state = OpSystemState.OS
         if (self.state == OpSystemState.UNKNOWN):
             log.debug(
                 "OpTestSystem CHECKING CURRENT STATE and TRANSITIONING for TARGET STATE: %s" % (state))