From 6fc64d9e03d3e34a55c2792fa2e80c1b9a4b93a0 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 9 Feb 2018 21:41:17 +0100
Subject: Read the env file only if exists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I8e718e583a5a47a089755c31e623a44732e5ba1e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
functest/ci/run_tests.py | 4 ++++
functest/tests/unit/ci/test_run_tests.py | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index 36b52fd42..8c0b11b1b 100644
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -96,7 +96,11 @@ class Runner(object):
@staticmethod
def source_envfile(rc_file=ENV_FILE):
"""Source the env file passed as arg"""
+ if not os.path.isfile(rc_file):
+ LOGGER.debug("No env file %s found", rc_file)
+ return
with open(rc_file, "r") as rcfd:
+ LOGGER.info("Sourcing env file %s", rc_file)
for line in rcfd:
var = (line.rstrip('"\n').replace('export ', '').split(
"=") if re.search(r'(.*)=(.*)', line) else None)
diff --git a/functest/tests/unit/ci/test_run_tests.py b/functest/tests/unit/ci/test_run_tests.py
index aaa265c50..bc9677433 100644
--- a/functest/tests/unit/ci/test_run_tests.py
+++ b/functest/tests/unit/ci/test_run_tests.py
@@ -92,7 +92,8 @@ class RunTestsTesting(unittest.TestCase):
envfile = 'rc_file'
with mock.patch('six.moves.builtins.open',
mock.mock_open(read_data=msg),
- create=True) as mock_method:
+ create=True) as mock_method,\
+ mock.patch('os.path.isfile', return_value=True):
mock_method.return_value.__iter__ = lambda self: iter(
self.readline, '')
self.runner.source_envfile(envfile)
--
cgit