From fea304c420b9ac166e590bc1d5d83856de8acf91 Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Sat, 8 Sep 2018 13:03:18 +0200 Subject: [PATCH] Make paths absolut when we know that we get valid paths to a file or a dir Signed-off-by: Jonatan Schlag --- src/nitsi/test.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/nitsi/test.py b/src/nitsi/test.py index dd61038..38e7afa 100755 --- a/src/nitsi/test.py +++ b/src/nitsi/test.py @@ -60,17 +60,6 @@ class Test(): self.recipe_file = "{}/recipe".format(self.path) self.settings_file = "{}/settings".format(self.path) - if recipe_file: - if not os.path.isabs(recipe_file): - self.recipe_file = os.path.abspath(recipe_file) - else: - self.recipe_file = recipe_file - - if settings_file: - if not os.path.isabs(settings_file): - self.settings_file = os.path.abspath(settings_file) - else: - self.settings_file = settings_file # We can also go on without a settings file if self.settings_file: @@ -87,6 +76,18 @@ class Test(): logger.error("No such file: {}".format(self.recipe_file)) raise TestException("No recipe file found") + if recipe_file: + if not os.path.isabs(recipe_file): + self.recipe_file = os.path.abspath(recipe_file) + else: + self.recipe_file = recipe_file + + if settings_file: + if not os.path.isabs(settings_file): + self.settings_file = os.path.abspath(settings_file) + else: + self.settings_file = settings_file + # Init logging if dir: -- 2.39.2