Correctly handle exit codes

[nitsi.git] / test.py

diff --git a/test.py b/test.py
index d9001dc14a346dd24361e20f7aaaea518bf2f14f..634bf5b174faff4de75215cadded0c3295f92631 100755 (executable)
--- a/test.py
+++ b/test.py
@@ -233,6 +233,11 @@ class connection():
 
         return self.con.in_waiting
 
+    def line_in_buffer(self):
+        if b"\n" in self.buffer:
+            return True
+
+        return False
 
     def readline2(self, pattern=None):
         string = ""
@@ -269,17 +274,33 @@ class connection():
             print("We are  not logged in")
             return False
 
+    def print_lines_in_buffer(self):
+        while True:
+            self.log.debug("Fill buffer ...")
+            self.peek(len(self.buffer) + self.in_waiting)
+            self.log.debug("Current buffer length: {}".format(len(self.buffer)))
+            if self.line_in_buffer() == True:
+                while self.line_in_buffer() == True:
+                    data = self.readline()
+                    self.log_console_line(data.decode())
+            else:
+                self.log.debug("We have printed all lines in the buffer")
+                break
+
     def login(self, password):
         if self.username == None:
             self.log.error("Username cannot be blank")
             return False
 
+        self.print_lines_in_buffer()
+
         # Hit enter to see what we get
         self.con.write(b'\n')
         # We get two new lines \r\n ?
         data = self.readline()
         self.log_console_line(data.decode())
 
+        self.print_lines_in_buffer()
 
         if self.back_at_prompt():
             self.log.debug("We are already logged in.")
@@ -287,11 +308,6 @@ class connection():
 
         # Read all line till we get login:
         while 1:
-            data = self.peek()
-            if not data.decode() == "l":
-                self.log.debug("We get no l at the start")
-                self.log_console_line(self.readline().decode())
-
             # We need to use self.in_waiting because with self.con.in_waiting we get
             # not the complete string
             size = len(self.buffer) + self.in_waiting
@@ -339,7 +355,7 @@ class connection():
         self.con.flush()
 
     def command(self, command):
-        self.write("{}\n".format(command))
+        self.write("{}; echo \"END: $?\"\n".format(command))
 
         # We need to read out the prompt for this command first
         # If we do not do this we will break the loop immediately
@@ -351,6 +367,13 @@ class connection():
             data = self.readline()
             self.log_console_line(data.decode())
 
+        # We saved our exit code in data (the last line)
+        self.log.debug(data.decode())
+        data = data.decode().replace("END: ", "")
+        self.log.debug(data)
+        self.log.debug(data.strip())
+        return data.strip()
+
 
 # A class which define and undefine a virtual network based on an xml file
 class network():
@@ -492,12 +515,15 @@ class test():
     def run_recipe(self):
         for line in self.recipe.recipe:
             return_value = self.virtual_machines[line[0]].cmd(line[2])
-            if not return_value and line[1] == "":
-                self.log.error("Failed to execute command '{}' on {}".format(line[2],line[0]))
+            self.log.debug("Return value is: {}".format(return_value))
+            if return_value != "0" and line[1] == "":
+                self.log.error("Failed to execute command '{}' on {}, return code: {}".format(line[2],line[0], return_value))
                 return False
-            elif return_value == True and line[1] == "!":
-                self.log.error("Succeded to execute command '{}' on {}".format(line[2],line[0]))
+            elif return_value == "0" and line[1] == "!":
+                self.log.error("Succeded to execute command '{}' on {}, return code: {}".format(line[2],line[0],return_value))
                 return False
+            else:
+                self.log.debug("Command '{}' on {} returned with: {}".format(line[2],line[0],return_value))
 
     def virtual_environ_stop(self):
         for name in self.virtual_environ.machine_names:
@@ -582,7 +608,10 @@ if __name__ == "__main__":
 
     args = parser.parse_args()
 
-    _recipe = recipe("/home/jonatan/python-testing-kvm/test/recipe")
     currenttest = test(args.dir)
     currenttest.read_settings()
-    currenttest.virtual_environ_setup()
\ No newline at end of file
+    currenttest.virtual_environ_setup()
+    currenttest.load_recipe()
+    currenttest.virtual_environ_start()
+    currenttest.run_recipe()
+    currenttest.virtual_environ_stop()
\ No newline at end of file