aboutsummaryrefslogtreecommitdiffstats
path: root/functest/core
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-03-28 20:38:15 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-04-04 10:26:22 +0200
commit457321c2c8ed7e8dcb1daccb6d2fd9814e6a98ca (patch)
tree47a5ab66f98eed8fb238a7fffc6788436771bef7 /functest/core
parent62661e25ab10f1fea79b8c1e19c6d493b3e12b68 (diff)
Add case_name as constructor arg
It allows managing multiple TestCase names with only one TestCase module. It is mainly required by odl which implements: - odl, - odl_netvirt, - fds. It also renames case to case_name in Features to conform with TestCases. JIRA: FUNCTEST-762 Change-Id: Ie254f754a0ea3077a8afda1c470528d38c79478f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/core')
-rw-r--r--functest/core/feature.py5
-rw-r--r--functest/core/testcase.py5
-rw-r--r--functest/core/vnf_base.py5
3 files changed, 7 insertions, 8 deletions
diff --git a/functest/core/feature.py b/functest/core/feature.py
index 325c10d4..5149f80f 100644
--- a/functest/core/feature.py
+++ b/functest/core/feature.py
@@ -8,10 +8,9 @@ from functest.utils.constants import CONST
class Feature(base.TestCase):
- def __init__(self, project='functest', case='', repo='', cmd=''):
- super(Feature, self).__init__()
+ def __init__(self, project='functest', case_name='', repo='', cmd=''):
+ super(Feature, self).__init__(case_name=case_name)
self.project_name = project
- self.case_name = case
self.cmd = cmd
self.repo = CONST.__getattribute__(repo)
self.result_file = self.get_result_file()
diff --git a/functest/core/testcase.py b/functest/core/testcase.py
index b540cfb5..8c5fd647 100644
--- a/functest/core/testcase.py
+++ b/functest/core/testcase.py
@@ -27,10 +27,10 @@ class TestCase(object):
logger = ft_logger.Logger(__name__).getLogger()
- def __init__(self):
+ def __init__(self, case_name=""):
self.details = {}
self.project_name = "functest"
- self.case_name = ""
+ self.case_name = case_name
self.criteria = ""
self.start_time = ""
self.stop_time = ""
@@ -87,6 +87,7 @@ class TestCase(object):
It could be overriden if the common implementation is not
suitable. The following attributes must be set before pushing
the results to DB:
+ * project_name,
* case_name,
* criteria,
* start_time,
diff --git a/functest/core/vnf_base.py b/functest/core/vnf_base.py
index 3f0adcc6..3d3a441f 100644
--- a/functest/core/vnf_base.py
+++ b/functest/core/vnf_base.py
@@ -21,11 +21,10 @@ class VnfOnBoardingBase(base.TestCase):
logger = ft_logger.Logger(__name__).getLogger()
- def __init__(self, project='functest', case='', repo='', cmd=''):
- super(VnfOnBoardingBase, self).__init__()
+ def __init__(self, project='functest', case_name='', repo='', cmd=''):
+ super(VnfOnBoardingBase, self).__init__(case_name=case_name)
self.repo = repo
self.project_name = project
- self.case_name = case
self.cmd = cmd
self.details = {}
self.result_dir = CONST.dir_results