X-Git-Url: http://git.ipfire.org/?p=nitsi.git;a=blobdiff_plain;f=src%2Fnitsi%2Ftest.py;h=3732304cd571f802c846d43a82c46735fdcc399c;hp=7f6b868fb815452b9e1fed16dd9224d66fe8af25;hb=129c0b0f83b20ebef8b7c5355029c9aaa5e4aaa0;hpb=ee227ea12de1bbbdb31d37dbd5b12720d684afd3

diff --git a/src/nitsi/test.py b/src/nitsi/test.py
index 7f6b868..3732304 100755
--- a/src/nitsi/test.py
+++ b/src/nitsi/test.py
@@ -32,10 +32,12 @@ class Test():
         self.settings_file = "{}/settings".format(self.path)
         if not os.path.isfile(self.settings_file):
             self.log.error("No such file: {}".format(self.settings_file))
+            raise TestException("No settings file found")
 
         self.recipe_file = "{}/recipe".format(self.path)
         if not os.path.isfile(self.recipe_file):
             self.log.error("No such file: {}".format(self.recipe_file))
+            raise TestException("No recipe file found")
 
     def read_settings(self):
         self.config = configparser.ConfigParser()
@@ -44,6 +46,11 @@ class Test():
         self.description = self.config["DEFAULT"]["description"]
         self.copy_to = self.config["DEFAULT"]["copy_to"]
         self.copy_from = self.config["DEFAULT"]["copy_from"]
+        self.virtual_environ_name = self.config["VIRTUAL_ENVIRONMENT"]["name"]
+        self.virtual_environ_path = self.config["VIRTUAL_ENVIRONMENT"]["path"]
+        self.virtual_environ_path = os.path.normpath(self.path + "/" + self.virtual_environ_path)
+
+        # Parse copy_from setting
         self.copy_from = self.copy_from.split(",")
 
         tmp = []
@@ -65,9 +72,7 @@ class Test():
 
         self.copy_from = tmp
 
-        self.virtual_environ_name = self.config["VIRTUAL_ENVIRONMENT"]["name"]
-        self.virtual_environ_path = self.config["VIRTUAL_ENVIRONMENT"]["path"]
-        self.virtual_environ_path = os.path.normpath(self.path + "/" + self.virtual_environ_path)
+
 
     def virtual_environ_setup(self):
         self.virtual_environ = virtual_environ.Virtual_environ(self.virtual_environ_path)