summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-12-02 13:15:57 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-02 13:15:57 +0000
commit51b5b8025f95d1674d58977d2c6a26f83977d414 (patch)
treea939c4daf8e36a7462678e3074f2981f68ed3f2c
parentad55c7770cb290085682af170876c03653059a81 (diff)
parent01342c5f655727314dd2fb2e6bc5bc5c9dba2969 (diff)
Merge "remove functest_repo from TestBase, move it to vPingBase"
-rw-r--r--functest/core/TestCasesBase.py2
-rw-r--r--functest/opnfv_tests/openstack/vping/vping_base.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/functest/core/TestCasesBase.py b/functest/core/TestCasesBase.py
index ac2010718..777b09f0b 100644
--- a/functest/core/TestCasesBase.py
+++ b/functest/core/TestCasesBase.py
@@ -11,7 +11,6 @@ import os
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
-import functest.utils.functest_constants as ft_constants
class TestCasesBase(object):
@@ -23,7 +22,6 @@ class TestCasesBase(object):
logger = ft_logger.Logger(__name__).getLogger()
def __init__(self):
- self.functest_repo = ft_constants.FUNCTEST_REPO_DIR
self.details = {}
self.project_name = "functest"
self.case_name = ""
diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index 7d56e9daa..00177a222 100644
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -13,6 +13,7 @@ import time
from datetime import datetime
import functest.utils.functest_utils as ft_utils
+import functest.utils.functest_constants as ft_constants
import functest.utils.openstack_utils as os_utils
from functest.core import TestCasesBase
@@ -24,6 +25,7 @@ class VPingBase(TestCasesBase.TestCasesBase):
super(VPingBase, self).__init__()
self.logger = None
+ self.functest_repo = ft_constants.FUNCTEST_REPO_DIR
self.repo = get_conf('general.directories.dir_vping')
self.vm1_name = get_conf('vping.vm_name_1')
self.vm2_name = get_conf('vping.vm_name_2')