Add .gitignore

[nitsi.git] / recipe.py

diff --git a/recipe.py b/recipe.py
index 3a9b009deba6e8990cb8b384dd22f579c4d19292..b7967f735f013694544c490b83260328ee7a7f1a 100644 (file)
--- a/recipe.py
+++ b/recipe.py
@@ -18,8 +18,14 @@ class RecipeExeption(Exception):
 class recipe():
     def __init__(self, path, circle=[]):
         self.recipe_file = path
-        self.log = logger.getChild(os.path.basename(self.recipe_file))
-        self.path = os.path.dirname(self.recipe_file)
+        try:
+            self.path = os.path.dirname(self.recipe_file)
+            self.name = os.path.basename(self.path)
+        except BaseException as e:
+            logger.error("Failed to get the name of the test to this recipe")
+            raise e
+
+        self.log = logger.getChild(self.name)
         self.log.debug("Path of recipe is: {}".format(self.recipe_file))
         self._recipe = None
         self._machines = None
@@ -29,11 +35,11 @@ class recipe():
             self.in_recursion = False
 
         self.circle = circle
-        self.log.debug(circle)
-        self.log.debug(self.circle)
+        self.log.debug("Tests we have already included: {}".format(self.circle))
 
         if not os.path.isfile(self.recipe_file):
-            self.log.error("No such file: {}".format(self.recipe_file))
+            self.log.error("{} is not a file".format(self.recipe_file))
+            raise RecipeExeption
 
         try:
             with open(self.recipe_file) as fobj:
@@ -62,7 +68,7 @@ class recipe():
         self._recipe = []
         i = 1
         for line in self.raw_recipe:
-            raw_line = line.split(":")
+            raw_line = line.split(":", 1)
             if len(raw_line) < 2:
                 self.log.error("Error parsing the recipe in line {}".format(i))
                 raise RecipeExeption