openstack/tempest
Code Issues Proposed changes

Merge "Rename base.rebuild_server to base.recreate_server"

Browse Source
This commit is contained in:
Zuul 2017-10-18 06:57:31 +00:00 committed by Gerrit Code Review
commit 8d5f43e02e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tempest/api/compute/base.py
View File

@ -301,7 +301,7 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
return image return image
@classmethod @classmethod
def rebuild_server(cls, server_id, validatable=False, **kwargs): def recreate_server(cls, server_id, validatable=False, **kwargs):
"""Destroy an existing class level server and creates a new one """Destroy an existing class level server and creates a new one
Some test classes use a test server that can be used by multiple Some test classes use a test server that can be used by multiple

2
tempest/api/compute/images/test_images_oneserver_negative.py
View File

@ -52,7 +52,7 @@ class ImagesOneServerNegativeTestJSON(base.BaseV2ComputeTest):
self._reset_server() self._reset_server()
def _reset_server(self): def _reset_server(self):
self.__class__.server_id = self.rebuild_server(self.server_id) self.__class__.server_id = self.recreate_server(self.server_id)
@classmethod @classmethod
def skip_checks(cls): def skip_checks(cls):

4
tempest/api/compute/servers/test_server_actions.py
View File

@ -55,7 +55,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
self.__class__.server_id = server['id'] self.__class__.server_id = server['id']
except Exception: except Exception:
# Rebuild server if something happened to it during a test # Rebuild server if something happened to it during a test
self.__class__.server_id = self.rebuild_server( self.__class__.server_id = self.recreate_server(
self.server_id, validatable=True) self.server_id, validatable=True)
def tearDown(self): def tearDown(self):
@ -75,7 +75,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
@classmethod @classmethod
def resource_setup(cls): def resource_setup(cls):
super(ServerActionsTestJSON, cls).resource_setup() super(ServerActionsTestJSON, cls).resource_setup()
cls.server_id = cls.rebuild_server(None, validatable=True) cls.server_id = cls.recreate_server(None, validatable=True)
@decorators.idempotent_id('6158df09-4b82-4ab3-af6d-29cf36af858d') @decorators.idempotent_id('6158df09-4b82-4ab3-af6d-29cf36af858d')
@testtools.skipUnless(CONF.compute_feature_enabled.change_password, @testtools.skipUnless(CONF.compute_feature_enabled.change_password,

4
tempest/api/compute/servers/test_servers_negative.py
View File

@ -37,7 +37,7 @@ class ServersNegativeTestJSON(base.BaseV2ComputeTest):
waiters.wait_for_server_status(self.client, self.server_id, waiters.wait_for_server_status(self.client, self.server_id,
'ACTIVE') 'ACTIVE')
except Exception: except Exception:
self.__class__.server_id = self.rebuild_server(self.server_id) self.__class__.server_id = self.recreate_server(self.server_id)
def tearDown(self): def tearDown(self):
self.server_check_teardown() self.server_check_teardown()
@ -551,7 +551,7 @@ class ServersNegativeTestMultiTenantJSON(base.BaseV2ComputeTest):
waiters.wait_for_server_status(self.servers_client, self.server_id, waiters.wait_for_server_status(self.servers_client, self.server_id,
'ACTIVE') 'ACTIVE')
except Exception: except Exception:
self.__class__.server_id = self.rebuild_server(self.server_id) self.__class__.server_id = self.recreate_server(self.server_id)
@classmethod @classmethod
def setup_clients(cls): def setup_clients(cls):