diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-05-30 15:02:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-30 15:02:06 +0000 |
| commit | a28e2b40877f022f6cc8bbc3ad9b586ef3dd126c (patch) | |
| tree | 015109b1867976702a2e90b050d00af0174f2b73 /functest/opnfv_tests/openstack | |
| parent | 8628e8f2bb97f4528767710ec8fdec5ea3643738 (diff) | |
| parent | 49a7e57f112d855b0609721b6082b15a94417380 (diff) | |
Merge "Define create_snapshot() and clean() in TestCase"
Diffstat (limited to 'functest/opnfv_tests/openstack')
4 files changed, 8 insertions, 8 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index e362fd4d0..2ae6817d0 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -27,7 +27,7 @@ import functest.utils.openstack_utils as os_utils logger = logging.getLogger(__name__) -class RallyBase(testcase.TestCase): +class RallyBase(testcase.OSGCTestCase): TESTS = ['authenticate', 'glance', 'cinder', 'heat', 'keystone', 'neutron', 'nova', 'quotas', 'requests', 'vm', 'all'] GLANCE_IMAGE_NAME = CONST.__getattribute__('openstack_image_name') diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py index 5f1f3a1dd..b2a215337 100755 --- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py +++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py @@ -27,7 +27,7 @@ from tempest_conf import TempestConf logger = logging.getLogger(__name__) -class RefstackClient(testcase.TestCase): +class RefstackClient(testcase.OSGCTestCase): def __init__(self, **kwargs): if "case_name" not in kwargs: diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 65d9f1fa2..cb8e9b4a5 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -28,7 +28,7 @@ import functest.utils.functest_utils as ft_utils logger = logging.getLogger(__name__) -class TempestCommon(testcase.TestCase): +class TempestCommon(testcase.OSGCTestCase): def __init__(self, **kwargs): super(TempestCommon, self).__init__(**kwargs) diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py index 7f568821b..856d5f220 100644 --- a/functest/opnfv_tests/openstack/vping/vping_base.py +++ b/functest/opnfv_tests/openstack/vping/vping_base.py @@ -13,7 +13,7 @@ import os import time import uuid -from functest.core.testcase import TestCase +from functest.core import testcase from functest.utils import functest_utils from functest.utils.constants import CONST @@ -24,7 +24,7 @@ from snaps.openstack.tests import openstack_tests from snaps.openstack.utils import deploy_utils, nova_utils -class VPingBase(TestCase): +class VPingBase(testcase.OSGCTestCase): """ Base class for vPing tests that check connectivity between two VMs shared @@ -152,12 +152,12 @@ class VPingBase(TestCase): else: raise Exception('VMs never became active') - if result == TestCase.EX_RUN_ERROR: - return TestCase.EX_RUN_ERROR + if result == testcase.TestCase.EX_RUN_ERROR: + return testcase.TestCase.EX_RUN_ERROR self.stop_time = time.time() self.result = 100 - return TestCase.EX_OK + return testcase.TestCase.EX_OK def _cleanup(self): """ |