From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Sat, 23 Jun 2018 07:49:45 +0000 (+0200)
Subject: Fix check if we get correct files for settings and recipe
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aadbafc3e29c99e76174d3c3218be76268881ad8;p=nitsi.git

Fix check if we get correct files for settings and recipe

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---

diff --git a/src/nitsi/test.py b/src/nitsi/test.py
index 19c8c40..9cc1188 100755
--- a/src/nitsi/test.py
+++ b/src/nitsi/test.py
@@ -69,13 +69,20 @@ class Test():
             else:
                 self.settings_file = settings_file
 
-        if not os.path.isfile(self.settings_file):
-            logger.error("No such file: {}".format(self.settings_file))
-            raise TestException("No settings file found")
+        # We can also go on without a settings file
+        if self.settings_file:
+            if not os.path.isfile(self.settings_file):
+                logger.error("No such file: {}".format(self.settings_file))
+                raise TestException("No settings file found")
+
+        # os.path.isfile fails if self.recipe_file is None so we need to catch exceptions here
+        try:
+            if not (self.recipe_file or os.path.isfile(self.recipe_file)):
+                logger.error("No such file: {}".format(self.recipe_file))
+                raise TestException("No recipe file found")
+        except BaseException:
+            pass
 
-        if not os.path.isfile(self.recipe_file):
-            logger.error("No such file: {}".format(self.recipe_file))
-            raise TestException("No recipe file found")
 
         # Init logging
         if dir: