openstack/tempest
Code Issues Proposed changes

Merge "Use min_count to create servers in ListServersNegativeTestJSON"

Browse Source
This commit is contained in:
Jenkins 2017-05-02 14:52:00 +00:00 committed by Gerrit Code Review
commit ee1108b15a
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tempest/api/compute/servers/test_list_servers_negative.py
View File

@ -34,13 +34,12 @@ class ListServersNegativeTestJSON(base.BaseV2ComputeTest):
# by the test methods in this class. These # by the test methods in this class. These
# servers are cleaned up automatically in the # servers are cleaned up automatically in the
# tearDownClass method of the super-class. # tearDownClass method of the super-class.
cls.deleted_fixtures = [] body = cls.create_test_server(wait_until='ACTIVE', min_count=3)
cls.create_test_server(wait_until='ACTIVE', min_count=2)
srv = cls.create_test_server(wait_until='ACTIVE') # delete one of the created servers
cls.client.delete_server(srv['id']) cls.deleted_id = body['server']['id']
waiters.wait_for_server_termination(cls.client, srv['id']) cls.client.delete_server(cls.deleted_id)
cls.deleted_fixtures.append(srv) waiters.wait_for_server_termination(cls.client, cls.deleted_id)
@decorators.attr(type=['negative']) @decorators.attr(type=['negative'])
@decorators.idempotent_id('24a26f1a-1ddc-4eea-b0d7-a90cc874ad8f') @decorators.idempotent_id('24a26f1a-1ddc-4eea-b0d7-a90cc874ad8f')
@ -49,9 +48,8 @@ class ListServersNegativeTestJSON(base.BaseV2ComputeTest):
# List servers and verify server not returned # List servers and verify server not returned
body = self.client.list_servers() body = self.client.list_servers()
servers = body['servers'] servers = body['servers']
deleted_ids = [s['id'] for s in self.deleted_fixtures]
actual = [srv for srv in servers actual = [srv for srv in servers
if srv['id'] in deleted_ids] if srv['id'] == self.deleted_id]
self.assertEqual([], actual) self.assertEqual([], actual)
@decorators.attr(type=['negative']) @decorators.attr(type=['negative'])
@ -136,9 +134,8 @@ class ListServersNegativeTestJSON(base.BaseV2ComputeTest):
@decorators.idempotent_id('93055106-2d34-46fe-af68-d9ddbf7ee570') @decorators.idempotent_id('93055106-2d34-46fe-af68-d9ddbf7ee570')
def test_list_servers_detail_server_is_deleted(self): def test_list_servers_detail_server_is_deleted(self):
# Server details are not listed for a deleted server # Server details are not listed for a deleted server
deleted_ids = [s['id'] for s in self.deleted_fixtures]
body = self.client.list_servers(detail=True) body = self.client.list_servers(detail=True)
servers = body['servers'] servers = body['servers']
actual = [srv for srv in servers actual = [srv for srv in servers
if srv['id'] in deleted_ids] if srv['id'] == self.deleted_id]
self.assertEqual([], actual) self.assertEqual([], actual)