Add support for the all: statement

[nitsi.git] / test.py

diff --git a/test.py b/test.py
index 942411ba9c1db70b9cb6f0d7f1016bb0546040f0..c755cbc42d2b061fe5236a64f9ad96b39c9338c3 100755 (executable)
--- a/test.py
+++ b/test.py
@@ -414,6 +414,12 @@ class recipe():
         self.path = os.path.dirname(self.recipe_file)
         self.log.debug("Path of recipe is: {}".format(self.recipe_file))
         self._recipe = None
+        self._machines = None
+
+        self.in_recursion = True
+        if len(circle) == 0:
+            self.in_recursion = False
+
         self.circle = circle
         self.log.debug(circle)
         self.log.debug(self.circle)
@@ -434,6 +440,16 @@ class recipe():
 
         return self._recipe
 
+    @property
+    def machines(self):
+        if not self._machines:
+            self._machines = []
+            for line in self._recipe:
+                if line[0] != "all" and line[0] not in self._machines:
+                    self._machines.append(line[0])
+
+        return self._machines
+
     def parse(self):
         self._recipe = []
         i = 1
@@ -442,47 +458,52 @@ class recipe():
             if len(raw_line) < 2:
                 self.log.error("Error parsing the recipe in line {}".format(i))
                 raise RecipeExeption
-            cmd = raw_line[1]
+            cmd = raw_line[1].strip()
             raw_line = raw_line[0].strip().split(" ")
             if len(raw_line) == 0:
                 self.log.error("Failed to parse the recipe in line {}".format(i))
                 raise RecipeExeption
-            elif len(raw_line) == 1:
-                if raw_line[0] == "":
+
+            if raw_line[0].strip() == "":
                     self.log.error("Failed to parse the recipe in line {}".format(i))
                     raise RecipeExeption
-                # We could get a machine here or a include statement
-                if raw_line[0].strip() == "include":
-                    path = cmd.strip()
-                    path = os.path.normpath(self.path + "/" + path)
-                    path = path + "/recipe"
-                    if path in self.circle:
-                        self.log.error("Detect import loop!")
-                        raise RecipeExeption
-                    self.circle.append(path)
-                    recipe_to_include = recipe(path, circle=self.circle)
-                else:
-                    machine = raw_line[0]
-                    extra = ""
-            elif len(raw_line) == 2:
-                if raw_line[0].strip() == "include":
-                    path = cmd
-                    path = os.path.normpath(self.path + "/" + path)
-                    path = path + "/recipe"
-                    if path in self.circle:
-                        self.log.error("Detect import loop!")
-                        raise RecipeExeption
-                    self.circle.append(path)
-                    recipe_to_include = recipe(path, circle=self.circle)
-                else:
-                    machine = raw_line[0]
-                    extra = raw_line[1]
-            if raw_line[0].strip() == "include":
+
+            machine = raw_line[0].strip()
+
+            if len(raw_line) == 2:
+                extra = raw_line[1].strip()
+            else:
+                extra = ""
+
+            # We could get a machine here or a include statement
+            if machine == "include":
+                path = cmd.strip()
+                path = os.path.normpath(self.path + "/" + path)
+                path = path + "/recipe"
+                if path in self.circle:
+                    self.log.error("Detect import loop!")
+                    raise RecipeExeption
+                self.circle.append(path)
+                recipe_to_include = recipe(path, circle=self.circle)
+
+            if machine == "include":
                 self._recipe.extend(recipe_to_include.recipe)
             else:
                 self._recipe.append((machine.strip(), extra.strip(), cmd.strip()))
             i = i + 1
 
+            if not self.in_recursion:
+                tmp_recipe = []
+                for line in self._recipe:
+                    if line[0] != "all":
+                        tmp_recipe.append(line)
+                    else:
+                        for machine in self.machines:
+                            tmp_recipe.append((machine.strip(), line[1], line[2]))
+
+                self._recipe = tmp_recipe
+
+
 
 class test():
     def __init__(self, path):
@@ -640,6 +661,11 @@ if __name__ == "__main__":
     currenttest.read_settings()
     currenttest.virtual_environ_setup()
     currenttest.load_recipe()
-    currenttest.virtual_environ_start()
-    currenttest.run_recipe()
-    currenttest.virtual_environ_stop()
\ No newline at end of file
+    try:
+        currenttest.virtual_environ_start()
+        currenttest.run_recipe()
+    except BaseException as e:
+        print(e)
+    finally:
+        currenttest.virtual_environ_stop()
+