From 2ae6b9006cd405a2e56d81cc00dd2a6a3c4f55c5 Mon Sep 17 00:00:00 2001 From: zhufl Date: Mon, 8 May 2017 16:20:41 +0800 Subject: [PATCH] Merge test_update_server_name_in_stop_state test_update_server_name_in_stop_state can be merged with test_update_server_name, so we can save one create_server, and the code logic is still clear enough. test_update_server_name_in_stop_state is not used in defcore, so it can be safely removed. Change-Id: I687322e96d82c4c705b5654e9d1995234124d9f7 --- tempest/api/compute/servers/test_servers.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tempest/api/compute/servers/test_servers.py b/tempest/api/compute/servers/test_servers.py index 11f236b262..ea4c141233 100644 --- a/tempest/api/compute/servers/test_servers.py +++ b/tempest/api/compute/servers/test_servers.py @@ -102,14 +102,10 @@ class ServersTestJSON(base.BaseV2ComputeTest): prefix_name = u'\u00CD\u00F1st\u00E1\u00F1c\u00E9' self._update_server_name(server['id'], 'ACTIVE', prefix_name) - @decorators.idempotent_id('6ac19cb1-27a3-40ec-b350-810bdc04c08e') - def test_update_server_name_in_stop_state(self): - # The server name should be changed to the provided value - server = self.create_test_server(wait_until='ACTIVE') + # stop server and check server name update again self.client.stop_server(server['id']) waiters.wait_for_server_status(self.client, server['id'], 'SHUTOFF') # Update instance name with non-ASCII characters - prefix_name = u'\u00CD\u00F1st\u00E1\u00F1c\u00E9' updated_server = self._update_server_name(server['id'], 'SHUTOFF', prefix_name)