diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-10-15 05:14:05 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-10-15 05:14:05 +0000 |
commit | 4653d8ce0aa2db857e8a1b5a2226a9db819e90c6 (patch) | |
tree | fe20afe9aab83336ef8d3635a69125d7bdd6028e | |
parent | 4a6849e596dd5993755d52e3082593b0d43ffa4b (diff) | |
parent | 625b7f7676d0dc137dc0586a26445a98a6cfb19d (diff) | |
download | tempest-4653d8ce0aa2db857e8a1b5a2226a9db819e90c6.tar.gz |
Merge "Move status check to client for "messaging" tests"
-rw-r--r-- | tempest/api/messaging/test_queues.py | 25 | ||||
-rw-r--r-- | tempest/api_schema/response/messaging/v1/queues.py | 4 | ||||
-rw-r--r-- | tempest/services/messaging/json/messaging_client.py | 17 |
3 files changed, 24 insertions, 22 deletions
diff --git a/tempest/api/messaging/test_queues.py b/tempest/api/messaging/test_queues.py index ab099ff46..8f9ac208b 100644 --- a/tempest/api/messaging/test_queues.py +++ b/tempest/api/messaging/test_queues.py @@ -32,11 +32,10 @@ class TestQueues(base.BaseMessagingTest): def test_create_queue(self): # Create Queue queue_name = data_utils.rand_name('test-') - resp, body = self.create_queue(queue_name) + _, body = self.create_queue(queue_name) self.addCleanup(self.client.delete_queue, queue_name) - self.assertEqual('201', resp['status']) self.assertEqual('', body) @@ -57,30 +56,27 @@ class TestManageQueue(base.BaseMessagingTest): def test_delete_queue(self): # Delete Queue queue_name = self.queues.pop() - resp, body = self.delete_queue(queue_name) - self.assertEqual('204', resp['status']) + _, body = self.delete_queue(queue_name) self.assertEqual('', body) @test.attr(type='smoke') def test_check_queue_existence(self): # Checking Queue Existence for queue_name in self.queues: - resp, body = self.check_queue_exists(queue_name) - self.assertEqual('204', resp['status']) + _, body = self.check_queue_exists(queue_name) self.assertEqual('', body) @test.attr(type='smoke') def test_check_queue_head(self): # Checking Queue Existence by calling HEAD for queue_name in self.queues: - resp, body = self.check_queue_exists_head(queue_name) - self.assertEqual('204', resp['status']) + _, body = self.check_queue_exists_head(queue_name) self.assertEqual('', body) @test.attr(type='smoke') def test_list_queues(self): # Listing queues - resp, body = self.list_queues() + _, body = self.list_queues() self.assertEqual(len(body['queues']), len(self.queues)) for item in body['queues']: self.assertIn(item['name'], self.queues) @@ -91,7 +87,7 @@ class TestManageQueue(base.BaseMessagingTest): queue_name = self.queues[data_utils.rand_int_id(0, len(self.queues) - 1)] # Get Queue Stats for a newly created Queue - resp, body = self.get_queue_stats(queue_name) + _, body = self.get_queue_stats(queue_name) msgs = body['messages'] for element in ('free', 'claimed', 'total'): self.assertEqual(0, msgs[element]) @@ -104,8 +100,7 @@ class TestManageQueue(base.BaseMessagingTest): queue_name = self.queues[data_utils.rand_int_id(0, len(self.queues) - 1)] # Check the Queue has no metadata - resp, body = self.get_queue_metadata(queue_name) - self.assertEqual('200', resp['status']) + _, body = self.get_queue_metadata(queue_name) self.assertThat(body, matchers.HasLength(0)) # Create metadata key3 = [0, 1, 2, 3, 4] @@ -116,12 +111,10 @@ class TestManageQueue(base.BaseMessagingTest): req_body = dict() req_body[data_utils.rand_name('key1')] = req_body1 # Set Queue Metadata - resp, body = self.set_queue_metadata(queue_name, req_body) - self.assertEqual('204', resp['status']) + _, body = self.set_queue_metadata(queue_name, req_body) self.assertEqual('', body) # Get Queue Metadata - resp, body = self.get_queue_metadata(queue_name) - self.assertEqual('200', resp['status']) + _, body = self.get_queue_metadata(queue_name) self.assertThat(body, matchers.Equals(req_body)) @classmethod diff --git a/tempest/api_schema/response/messaging/v1/queues.py b/tempest/api_schema/response/messaging/v1/queues.py index f0b26915f..09e014772 100644 --- a/tempest/api_schema/response/messaging/v1/queues.py +++ b/tempest/api_schema/response/messaging/v1/queues.py @@ -105,7 +105,9 @@ queue_stats = { resource_schema = { 'type': 'array', - 'items': 'string', + 'items': { + 'type': 'string' + }, 'minItems': 1 } diff --git a/tempest/services/messaging/json/messaging_client.py b/tempest/services/messaging/json/messaging_client.py index 3e8239908..2794ea9d8 100644 --- a/tempest/services/messaging/json/messaging_client.py +++ b/tempest/services/messaging/json/messaging_client.py @@ -48,22 +48,26 @@ class MessagingClientJSON(rest_client.RestClient): def create_queue(self, queue_name): uri = '{0}/queues/{1}'.format(self.uri_prefix, queue_name) resp, body = self.put(uri, body=None) + self.expected_success(201, resp.status) return resp, body def get_queue(self, queue_name): uri = '{0}/queues/{1}'.format(self.uri_prefix, queue_name) resp, body = self.get(uri) + self.expected_success(204, resp.status) return resp, body def head_queue(self, queue_name): uri = '{0}/queues/{1}'.format(self.uri_prefix, queue_name) resp, body = self.head(uri) + self.expected_success(204, resp.status) return resp, body def delete_queue(self, queue_name): uri = '{0}/queues/{1}'.format(self.uri_prefix, queue_name) - resp = self.delete(uri) - return resp + resp, body = self.delete(uri) + self.expected_success(204, resp.status) + return resp, body def get_queue_stats(self, queue_name): uri = '{0}/queues/{1}/stats'.format(self.uri_prefix, queue_name) @@ -75,12 +79,14 @@ class MessagingClientJSON(rest_client.RestClient): def get_queue_metadata(self, queue_name): uri = '{0}/queues/{1}/metadata'.format(self.uri_prefix, queue_name) resp, body = self.get(uri) + self.expected_success(200, resp.status) body = json.loads(body) return resp, body def set_queue_metadata(self, queue_name, rbody): uri = '{0}/queues/{1}/metadata'.format(self.uri_prefix, queue_name) resp, body = self.put(uri, body=json.dumps(rbody)) + self.expected_success(204, resp.status) return resp, body def post_messages(self, queue_name, rbody): @@ -90,6 +96,7 @@ class MessagingClientJSON(rest_client.RestClient): headers=self.headers) body = json.loads(body) + self.validate_response(queues_schema.post_messages, resp, body) return resp, body def list_messages(self, queue_name): @@ -126,7 +133,7 @@ class MessagingClientJSON(rest_client.RestClient): def delete_messages(self, message_uri): resp, body = self.delete(message_uri) - assert(resp['status'] == '204') + self.expected_success(204, resp.status) return resp, body def post_claims(self, queue_name, rbody, url_params=False): @@ -152,10 +159,10 @@ class MessagingClientJSON(rest_client.RestClient): def update_claim(self, claim_uri, rbody): resp, body = self.patch(claim_uri, body=json.dumps(rbody)) - assert(resp['status'] == '204') + self.expected_success(204, resp.status) return resp, body def release_claim(self, claim_uri): resp, body = self.delete(claim_uri) - assert(resp['status'] == '204') + self.expected_success(204, resp.status) return resp, body |