openstack/tempest
Code Issues Proposed changes

Tests were not passing for test_servers in Kong tests. Kong was expecting too much information back from the POST.

Browse Source 
Change-Id: Ib74a525f0aa9da67e6af75d6c1a11845df8eabdd
This commit is contained in:
Brian Lamar 2011-11-03 14:22:00 -04:00
parent 6c9f2ec1de
commit 73aefd3540
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kong/tests/test_servers.py
View File

@ -24,6 +24,18 @@ class ServersTest(tests.FunctionalTest):
if getattr(self, 'server_id', False): if getattr(self, 'server_id', False):
self.os.nova.delete_server(self.server_id) self.os.nova.delete_server(self.server_id)
def _assert_created_server_entity(self, created_server):
actual_keys = set(created_server.keys())
expected_keys = set((
'id',
'adminPass',
'links',
))
print actual_keys
print expected_keys
self.assertTrue(expected_keys <= actual_keys)
self._assert_server_links(created_server)
def _assert_server_entity(self, server): def _assert_server_entity(self, server):
actual_keys = set(server.keys()) actual_keys = set(server.keys())
expected_keys = set(( expected_keys = set((
@ -43,7 +55,9 @@ class ServersTest(tests.FunctionalTest):
'updated', 'updated',
)) ))
self.assertTrue(expected_keys <= actual_keys) self.assertTrue(expected_keys <= actual_keys)
self._assert_server_links(server)
def _assert_server_links(self, server):
server_id = str(server['id']) server_id = str(server['id'])
host = self.nova['host'] host = self.nova['host']
port = self.nova['port'] port = self.nova['port']
@ -92,13 +106,8 @@ class ServersTest(tests.FunctionalTest):
_body = json.loads(body) _body = json.loads(body)
self.assertEqual(_body.keys(), ['server']) self.assertEqual(_body.keys(), ['server'])
created_server = _body['server'] created_server = _body['server']
admin_pass = created_server.pop('adminPass') admin_pass = created_server['adminPass']
self._assert_server_entity(created_server) self._assert_created_server_entity(created_server)
self.assertEqual(expected_server['name'], created_server['name'])
self.assertEqual(created_server['accessIPv4'], '')
self.assertEqual(created_server['accessIPv6'], '')
self.assertEqual(expected_server['metadata'],
created_server['metadata'])
self.server_id = created_server['id'] self.server_id = created_server['id']
# Get server again and ensure attributes stuck # Get server again and ensure attributes stuck
@ -107,7 +116,7 @@ class ServersTest(tests.FunctionalTest):
self.assertEqual(server['name'], expected_server['name']) self.assertEqual(server['name'], expected_server['name'])
self.assertEqual(server['accessIPv4'], '') self.assertEqual(server['accessIPv4'], '')
self.assertEqual(server['accessIPv6'], '') self.assertEqual(server['accessIPv6'], '')
self.assertEqual(server['metadata'], created_server['metadata']) self.assertEqual(server['metadata'], {'testEntry': 'testValue'})
# Parse last-updated time # Parse last-updated time
update_time = utils.load_isotime(server['created']) update_time = utils.load_isotime(server['created'])
@ -386,12 +395,13 @@ class ServersTest(tests.FunctionalTest):
created_server = _body['server'] created_server = _body['server']
self.server_id = _body['server']['id'] self.server_id = _body['server']['id']
admin_pass = created_server.pop('adminPass', None) admin_pass = created_server['adminPass']
self.assertEqual(expected_server['adminPass'], admin_pass) self.assertEqual(expected_server['adminPass'], admin_pass)
self._assert_server_entity(created_server) self._assert_created_server_entity(created_server)
self.assertEqual(expected_server['name'], created_server['name']) self.assertEqual(expected_server['metadata'], {
self.assertEqual(expected_server['metadata'], 'key1': 'value1',
created_server['metadata']) 'key2': 'value2',
})
self.os.nova.wait_for_server_status(created_server['id'], self.os.nova.wait_for_server_status(created_server['id'],
'ACTIVE', 'ACTIVE',