Allow including of recipe files

[nitsi.git] / src / nitsi / recipe.py

diff --git a/src/nitsi/recipe.py b/src/nitsi/recipe.py
index dc7bf60aa05964be527648dbaea2b57eee67a34b..e1e2af8904a4edb721ca01c942b0cef623a6a9e0 100644 (file)
--- a/src/nitsi/recipe.py
+++ b/src/nitsi/recipe.py
@@ -20,9 +20,10 @@ class Recipe():
         self.recipe_file = path
         try:
             self.path = os.path.dirname(self.recipe_file)
         self.recipe_file = path
         try:
             self.path = os.path.dirname(self.recipe_file)

+            self.path = os.path.abspath(self.path)

             self.name = os.path.basename(self.path)
         except BaseException as e:
             self.name = os.path.basename(self.path)
         except BaseException as e:

-            logger.error("Failed to get the name of the test to this recipe")
+            logger.error("Failed to get the path to this recipe")

             raise e
 
         self.log = logger.getChild(self.name)
             raise e
 
         self.log = logger.getChild(self.name)


@@ -102,7 +103,11 @@ class Recipe():
             if machine == "include":
                 path = cmd.strip()
                 path = os.path.normpath(self.path + "/" + path)
             if machine == "include":
                 path = cmd.strip()
                 path = os.path.normpath(self.path + "/" + path)

-                path = path + "/recipe"
+
+                # If we did not get a valid file we asume that we get a valid path to a test.
+                if os.path.isdir(path):
+                    path = path + "/recipe"
+

                 if path in self.circle:
                     self.log.error("Detect import loop!")
                     raise RecipeExeption("Detect import loop!")
                 if path in self.circle:
                     self.log.error("Detect import loop!")
                     raise RecipeExeption("Detect import loop!")