From e8da2bf327969e105d19ef73a8c4654c74eac4ff Mon Sep 17 00:00:00 2001 From: Jonatan Schlag Date: Sat, 23 Jun 2018 09:59:39 +0200 Subject: [PATCH] Fix check if we get an valid recipe file Signed-off-by: Jonatan Schlag --- src/nitsi/test.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/nitsi/test.py b/src/nitsi/test.py index 3ee7936..b9ea034 100755 --- a/src/nitsi/test.py +++ b/src/nitsi/test.py @@ -76,13 +76,14 @@ class Test(): 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)): + # os.path.isfile fails if self.recipe_file is None so we cannot use an and statement + if self.recipe_file: + if not os.path.isfile(self.recipe_file): logger.error("No such file: {}".format(self.recipe_file)) raise TestException("No recipe file found") - except BaseException: - pass + else: + logger.error("No such file: {}".format(self.recipe_file)) + raise TestException("No recipe file found") # Init logging -- 2.39.2