Moving API microversion fixture in resource_setup
API microversion fixture is used to set the API microversion on service client and reset it back after test execution. That is done in setUp() method and due to that API microversion is not set on service client during resource_setup() method and any API call will be requested on base version. To sync the complete test execution of test class with requested API microversion, this commit moves the API microversion setting in resource_setup() method. Related-Bug: #1881863 Change-Id: Id26c73e4f0554770cd13d2b8840fe430448cc87f
This commit is contained in:
parent
dad66cfd21
commit
8992770bad
|
@ -16,7 +16,6 @@
|
|||
from tempest.common import compute
|
||||
from tempest.common import waiters
|
||||
from tempest import config
|
||||
from tempest.lib.common import api_microversion_fixture
|
||||
from tempest.lib.common import api_version_utils
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib.common.utils import test_utils
|
||||
|
@ -57,8 +56,6 @@ class BaseVolumeTest(api_version_utils.BaseMicroversionTest,
|
|||
|
||||
def setUp(self):
|
||||
super(BaseVolumeTest, self).setUp()
|
||||
self.useFixture(api_microversion_fixture.APIMicroversionFixture(
|
||||
volume_microversion=self.request_microversion))
|
||||
|
||||
@classmethod
|
||||
def resource_setup(cls):
|
||||
|
@ -67,6 +64,8 @@ class BaseVolumeTest(api_version_utils.BaseMicroversionTest,
|
|||
api_version_utils.select_request_microversion(
|
||||
cls.min_microversion,
|
||||
CONF.volume.min_microversion))
|
||||
cls.setup_api_microversion_fixture(
|
||||
volume_microversion=cls.request_microversion)
|
||||
|
||||
@classmethod
|
||||
def create_volume(cls, wait_until='available', **kwargs):
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
|
||||
from tempest.common import waiters
|
||||
from tempest import config
|
||||
from tempest.lib.common import api_microversion_fixture
|
||||
from tempest.lib.common import api_version_utils
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib.common.utils import test_utils
|
||||
|
@ -51,8 +50,6 @@ class VolumeV3RbacBaseTests(
|
|||
|
||||
def setUp(self):
|
||||
super(VolumeV3RbacBaseTests, self).setUp()
|
||||
self.useFixture(api_microversion_fixture.APIMicroversionFixture(
|
||||
volume_microversion=self.request_microversion))
|
||||
|
||||
@classmethod
|
||||
def resource_setup(cls):
|
||||
|
@ -61,6 +58,8 @@ class VolumeV3RbacBaseTests(
|
|||
api_version_utils.select_request_microversion(
|
||||
cls.min_microversion,
|
||||
CONF.volume.min_microversion))
|
||||
cls.setup_api_microversion_fixture(
|
||||
volume_microversion=cls.request_microversion)
|
||||
|
||||
def do_request(self, method, expected_status=200, client=None, **payload):
|
||||
"""Perform API call
|
||||
|
|
Loading…
Reference in New Issue