vmrunner: refactor find_exit_trigger

Author: alfreb

vmrunner/vmrunner.py

@@ -573,22 +573,22 @@ def clean(self):
         subprocess.call(["rm","-rf","build"])
         return self
 
-    def find_exit_trigger(self, line):
+    def find_exit_status(self, line):
 
         # Kernel reports service exit status
         if (line.startswith("     [ Kernel ] service exited with status") or
             line.startswith("     [ main ] returned with status")):
 
             self._exit_status = int(line.split(" ")[-1].rstrip())
             self._exit_msg = "Service exited with status " + str(self._exit_status)
-            return True
+            return self._exit_status
 
         # Special case for end-of-transmission, e.g. on panic
         if line == EOT:
             self._exit_status = exit_codes["VM_EOT"]
-            return True
+            return self._exit_status
 
-        return False
+        return None
 
 
     def trigger_event(self, line):
@@ -642,7 +642,7 @@ def boot(self, timeout = 60, multiboot = True, kernel_args = "booted with vmrunn
                 print color.WARNING("Exception thrown while waiting for vm output")
                 break
 
-            if line and not self.find_exit_trigger(line):
+            if line and self.find_exit_status(line) == None:
                     print color.VM(line.rstrip())
                     self.trigger_event(line)
 
@@ -673,7 +673,7 @@ def boot(self, timeout = 60, multiboot = True, kernel_args = "booted with vmrunn
                 lines = data.split("\n")
                 for line in lines:
                     print color.VM(line)
-                    self.find_exit_trigger(line)
+                    self.find_exit_status(line)
                     # Note: keep going. Might find panic after service exit
 
             except Exception as e: