From a91b49fca69922d2401ba2a55fa867a5385b56cc Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 5 May 2017 13:01:20 +0200 Subject: Replace project_name by case_name in result file name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It avoids erasing functest.log when project_name = functest. Change-Id: Icae898abb8b51c89b79bb1124adfadab8b0b3b99 Signed-off-by: Cédric Ollivier --- functest/core/feature.py | 2 +- functest/tests/unit/core/test_feature.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/functest/core/feature.py b/functest/core/feature.py index ed9efc70b..8563c9257 100644 --- a/functest/core/feature.py +++ b/functest/core/feature.py @@ -32,7 +32,7 @@ class Feature(base.TestCase): def __init__(self, **kwargs): super(Feature, self).__init__(**kwargs) self.result_file = "{}/{}.log".format( - CONST.__getattribute__('dir_results'), self.project_name) + CONST.__getattribute__('dir_results'), self.case_name) def execute(self, **kwargs): """Execute the Python method. diff --git a/functest/tests/unit/core/test_feature.py b/functest/tests/unit/core/test_feature.py index 993da5a03..8de42ec50 100644 --- a/functest/tests/unit/core/test_feature.py +++ b/functest/tests/unit/core/test_feature.py @@ -28,7 +28,7 @@ class FeatureTestingBase(unittest.TestCase): _project_name = "bar" _repo = "dir_repo_copper" _cmd = "cd /home/opnfv/repos/foo/tests && bash run.sh && cd -" - _output_file = '/home/opnfv/functest/results/bar.log' + _output_file = '/home/opnfv/functest/results/foo.log' feature = None @mock.patch('time.time', side_effect=[1, 2]) -- cgit 1.2.3-korg