diff options
| author |   Cedric Ollivier <ollivier.cedric@gmail.com> | 2017-03-28 08:12:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-28 08:12:21 +0000 |
| commit | 18ffb2a431fd82055cd5abf656f00f2c90af7146 (patch) | |
| tree | 67cb1e8045812d29517a026ac5cc09f4bab28009 /functest/core | |
| parent | 514c97b036cf968e03e600a4761757448bef0a0a (diff) | |
| parent | 69e51470d8e9f51e02d5f0bd6e957c4e24c603c6 (diff) | |
Merge "Rename testcase_base to testcase"
Diffstat (limited to 'functest/core')
| -rw-r--r-- | functest/core/feature_base.py | 2 | ||||
| -rw-r--r-- | functest/core/pytest_suite_runner.py | 2 | ||||
| -rw-r--r-- | functest/core/testcase.py (renamed from functest/core/testcase_base.py) | 0 | ||||
| -rw-r--r-- | functest/core/vnf_base.py | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/functest/core/feature_base.py b/functest/core/feature_base.py index 9224d6c9..f7f3e460 100644 --- a/functest/core/feature_base.py +++ b/functest/core/feature_base.py @@ -1,6 +1,6 @@ import time -import testcase_base as base +import testcase as base import functest.utils.functest_utils as ft_utils import functest.utils.functest_logger as ft_logger from functest.utils.constants import CONST diff --git a/functest/core/pytest_suite_runner.py b/functest/core/pytest_suite_runner.py index db60cefc..4f777628 100644 --- a/functest/core/pytest_suite_runner.py +++ b/functest/core/pytest_suite_runner.py @@ -5,7 +5,7 @@ # # http://www.apache.org/licenses/LICENSE-2.0 -import testcase_base as base +import testcase as base import unittest import time diff --git a/functest/core/testcase_base.py b/functest/core/testcase.py index 85d1fc74..85d1fc74 100644 --- a/functest/core/testcase_base.py +++ b/functest/core/testcase.py diff --git a/functest/core/vnf_base.py b/functest/core/vnf_base.py index cd689c27..c374c491 100644 --- a/functest/core/vnf_base.py +++ b/functest/core/vnf_base.py @@ -14,7 +14,7 @@ import inspect import functest.utils.functest_logger as ft_logger import functest.utils.openstack_utils as os_utils import functest.utils.functest_utils as ft_utils -import testcase_base as base +import testcase as base from functest.utils.constants import CONST |