X-Git-Url: http://git.ipfire.org/?p=nitsi.git;a=blobdiff_plain;f=src%2Fnitsi%2Ftest.py;fp=src%2Fnitsi%2Ftest.py;h=8c454a502714caee321d08610fabb85a2d464414;hp=196b2fbb398aa57b97172459fbdd968b148c0715;hb=31ebadfbb09c78445d9bd52747024bda570797a6;hpb=e350485bbaa99c771b028f5f980bcd52e2d346a3

diff --git a/src/nitsi/test.py b/src/nitsi/test.py
index 196b2fb..8c454a5 100755
--- a/src/nitsi/test.py
+++ b/src/nitsi/test.py
@@ -19,7 +19,7 @@ class TestException(Exception):
         self.message = message
 
 class Test():
-    def __init__(self, log_path, dir=None, recipe_file=None, settings_file=None, settings=None):
+    def __init__(self, log_path, dir=None, recipe_file=None, settings_file=None, settings=None, default_settings_file=None):
         # init settings var
         self.settings = settings
 
@@ -30,6 +30,8 @@ class Test():
         self.recipe_file = None
         self.path = None
 
+        self.default_settings_file = default_settings_file
+
         # We need at least a path to a recipe file or a dir to a test
         if not dir and not recipe:
             raise TestException("Did not get a path to a test or to a recipe file")
@@ -59,6 +61,7 @@ class Test():
         if not self.recipe_file:
             raise TestException("No recipe file found")
 
+        self.default_settings_file = self.check_file(self.default_settings_file)
 
         # Init logging
         if dir:
@@ -69,7 +72,10 @@ class Test():
 
         # Parse config and settings:
         if self.settings_file:
-            self.settings.set_config_values_from_file(self.settings_file, type="settings-file")#
+            self.settings.set_config_values_from_file(self.settings_file, type="settings-file")
+
+        if self.default_settings_file:
+            self.settings.set_config_values_from_file(self.default_settings_file, type="default-settings-file")
 
         # Check settings
         self.settings.check_config_values()