Fix order of arguments in assertEqual
Some tests used incorrect order assertEqual(observed, expected). The correct order expected by testtools is assertEqual(expected, observed). This patch fix the issue in the module zaqar/tests/unit/transport/websocket . Partial-Bug: #1259292 Change-Id: Id480e0fe6504f6511707e6fc2edfbb5e6fc219f4
This commit is contained in:
MD NADEEM
parent
db445425d0
commit
fda1a26386
|
|
@ -83,7 +83,7 @@ class V1_1Base(TestBase):
|
|||
"""
|
||||
|
||||
def _empty_message_list(self, body):
|
||||
self.assertEqual(jsonutils.loads(body[0])['messages'], [])
|
||||
self.assertEqual([], jsonutils.loads(body[0])['messages'])
|
||||
|
||||
|
||||
class V1_1BaseFaulty(TestBaseFaulty):
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ class AuthTest(base.V2Base):
|
|||
|
||||
self.assertEqual(1, msg_mock.call_count)
|
||||
resp = json.loads(msg_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 403)
|
||||
self.assertEqual(403, resp['headers']['status'])
|
||||
|
||||
def test_failed_auth(self):
|
||||
msg_mock = mock.patch.object(self.protocol, 'sendMessage')
|
||||
|
|
@ -90,8 +90,8 @@ class AuthTest(base.V2Base):
|
|||
self.protocol._auth_response('401 error', 'Failed')
|
||||
self.assertEqual(1, msg_mock.call_count)
|
||||
resp = json.loads(msg_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 401)
|
||||
self.assertEqual(resp['request']['action'], 'authenticate')
|
||||
self.assertEqual(401, resp['headers']['status'])
|
||||
self.assertEqual('authenticate', resp['request']['action'])
|
||||
|
||||
def test_reauth(self):
|
||||
headers = self.headers.copy()
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
with mock.patch.object(self.protocol, 'sendMessage') as msg_mock:
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(msg_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
|
||||
action = "message_post"
|
||||
body = {"queue_name": "skittle",
|
||||
|
|
@ -70,7 +70,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
|
||||
def tearDown(self):
|
||||
super(ClaimsBaseTest, self).tearDown()
|
||||
|
|
@ -84,7 +84,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
@ddt.data('[', '[]', '.', '"fail"')
|
||||
def test_bad_claim(self, doc):
|
||||
|
|
@ -97,7 +97,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
action = "claim_update"
|
||||
body = doc
|
||||
|
|
@ -105,7 +105,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
def test_exceeded_claim(self):
|
||||
action = "claim_create"
|
||||
|
|
@ -120,7 +120,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
@ddt.data((-1, -1), (59, 60), (60, 59), (60, 43201), (43201, 60))
|
||||
def test_unacceptable_ttl_or_grace(self, ttl_grace):
|
||||
|
|
@ -136,7 +136,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
@ddt.data(-1, 59, 43201)
|
||||
def test_unacceptable_new_ttl(self, ttl):
|
||||
|
|
@ -153,7 +153,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
def test_default_ttl_and_grace(self):
|
||||
action = "claim_create"
|
||||
|
|
@ -165,7 +165,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
|
||||
action = "claim_get"
|
||||
body = {"queue_name": "skittle",
|
||||
|
|
@ -175,7 +175,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
self.assertEqual(self.defaults.claim_ttl, resp['body']['ttl'])
|
||||
|
||||
def test_lifecycle(self):
|
||||
|
|
@ -191,7 +191,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
claimed_messages = resp['body']['messages']
|
||||
claim_id = resp['body']['claim_id']
|
||||
|
||||
|
|
@ -203,7 +203,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
# Listing messages, by default, won't include claimed, will echo
|
||||
action = "message_list"
|
||||
|
|
@ -213,8 +213,8 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(resp['body']['messages'], [])
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
self.assertEqual([], resp['body']['messages'])
|
||||
|
||||
# Listing messages, by default, won't include claimed, won't echo
|
||||
|
||||
|
|
@ -224,8 +224,8 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(resp['body']['messages'], [])
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
self.assertEqual([], resp['body']['messages'])
|
||||
|
||||
# List messages, include_claimed, but don't echo
|
||||
|
||||
|
|
@ -236,7 +236,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
self.assertEqual(resp['body']['messages'], [])
|
||||
|
||||
# List messages with a different client-id and echo=false.
|
||||
|
|
@ -253,7 +253,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
|
||||
# Include claimed messages this time, and echo
|
||||
|
||||
|
|
@ -264,8 +264,8 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(len(resp['body']['messages']), len(claimed_messages))
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
self.assertEqual(len(claimed_messages), len(resp['body']['messages']))
|
||||
|
||||
message_id_1 = resp['body']['messages'][0]['id']
|
||||
message_id_2 = resp['body']['messages'][1]['id']
|
||||
|
|
@ -278,7 +278,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 403)
|
||||
self.assertEqual(403, resp['headers']['status'])
|
||||
|
||||
# Delete the message and its associated claim
|
||||
body = {"queue_name": "skittle",
|
||||
|
|
@ -288,7 +288,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
# Try to get it from the wrong project
|
||||
headers = {
|
||||
|
|
@ -302,7 +302,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 404)
|
||||
self.assertEqual(404, resp['headers']['status'])
|
||||
|
||||
# Get the message
|
||||
action = "message_get"
|
||||
|
|
@ -311,7 +311,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
|
||||
# Update the claim
|
||||
creation = timeutils.utcnow()
|
||||
|
|
@ -323,7 +323,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
# Get the claimed messages (again)
|
||||
action = "claim_get"
|
||||
|
|
@ -333,8 +333,8 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
query = timeutils.utcnow()
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(resp['body']['ttl'], 60)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
self.assertEqual(60, resp['body']['ttl'])
|
||||
|
||||
message_id_3 = resp['body']['messages'][0]['id']
|
||||
|
||||
|
|
@ -348,7 +348,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
# Try to delete a message with an invalid claim ID
|
||||
action = "message_delete"
|
||||
|
|
@ -359,7 +359,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
# Make sure it wasn't deleted!
|
||||
action = "message_get"
|
||||
|
|
@ -368,7 +368,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
|
||||
# Try to get a claim that doesn't exist
|
||||
action = "claim_get"
|
||||
|
|
@ -377,7 +377,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 404)
|
||||
self.assertEqual(404, resp['headers']['status'])
|
||||
|
||||
# Try to update a claim that doesn't exist
|
||||
action = "claim_update"
|
||||
|
|
@ -388,7 +388,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 404)
|
||||
self.assertEqual(404, resp['headers']['status'])
|
||||
|
||||
def test_post_claim_nonexistent_queue(self):
|
||||
action = "claim_create"
|
||||
|
|
@ -402,7 +402,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
def test_get_claim_nonexistent_queue(self):
|
||||
action = "claim_get"
|
||||
|
|
@ -415,7 +415,7 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 404)
|
||||
self.assertEqual(404, resp['headers']['status'])
|
||||
|
||||
def _get_a_claim(self):
|
||||
action = "claim_create"
|
||||
|
|
@ -429,6 +429,6 @@ class ClaimsBaseTest(base.V1_1Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
|
||||
return resp
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
with mock.patch.object(self.protocol, 'sendMessage') as msg_mock:
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(msg_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
|
||||
def tearDown(self):
|
||||
super(MessagesBaseTest, self).tearDown()
|
||||
|
|
@ -67,7 +67,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
def _test_post(self, sample_messages):
|
||||
action = "message_post"
|
||||
|
|
@ -82,9 +82,9 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
self.msg_ids = resp['body']['message_ids']
|
||||
self.assertEqual(len(self.msg_ids), len(sample_messages))
|
||||
self.assertEqual(len(sample_messages), len(self.msg_ids))
|
||||
|
||||
lookup = dict([(m['ttl'], m['body']) for m in sample_messages])
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 404)
|
||||
self.assertEqual(404, resp['headers']['status'])
|
||||
|
||||
# Correct project ID
|
||||
req = test_utils.create_request(action, body, self.headers)
|
||||
|
|
@ -115,12 +115,12 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
|
||||
# Check message properties
|
||||
message = resp['body']['messages']
|
||||
self.assertEqual(message['body'], lookup[message['ttl']])
|
||||
self.assertEqual(message['id'], msg_id)
|
||||
self.assertEqual(lookup[message['ttl']], message['body'])
|
||||
self.assertEqual(msg_id, message['id'])
|
||||
|
||||
# no negative age
|
||||
# NOTE(cpp-cabrera): testtools lacks
|
||||
|
|
@ -137,7 +137,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
expected_ttls = set(m['ttl'] for m in sample_messages)
|
||||
actual_ttls = set(m['ttl'] for m in resp['body']['messages'])
|
||||
self.assertFalse(expected_ttls - actual_ttls)
|
||||
|
|
@ -162,14 +162,14 @@ class MessagesBaseTest(base.V2Base):
|
|||
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
# Listing restriction
|
||||
body['limit'] = 21
|
||||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
# Bulk deletion restriction
|
||||
del_msg_ids = msg_id * 22
|
||||
|
|
@ -179,7 +179,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
req = test_utils.create_request(action, body, self.headers)
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
def test_post_single(self):
|
||||
sample_messages = [
|
||||
|
|
@ -212,7 +212,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
msg_id = resp['body']['message_ids'][0]
|
||||
|
||||
action = "message_get"
|
||||
|
|
@ -223,7 +223,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
self.assertEqual(self.default_message_ttl,
|
||||
resp['body']['messages']['ttl'])
|
||||
|
||||
|
|
@ -234,7 +234,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
queue_name = queue_name.encode('utf-8')
|
||||
|
||||
resp = self._post_messages(queue_name)
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
def test_post_with_long_queue_name(self):
|
||||
# NOTE(kgriffs): This test verifies that routes with
|
||||
|
|
@ -244,16 +244,16 @@ class MessagesBaseTest(base.V2Base):
|
|||
queue_name = 'v' * validation.QUEUE_NAME_MAX_LEN
|
||||
|
||||
resp = self._post_messages(queue_name)
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
|
||||
queue_name += 'v'
|
||||
resp = self._post_messages(queue_name)
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
def test_post_to_missing_queue(self):
|
||||
queue_name = 'nonexistent'
|
||||
resp = self._post_messages(queue_name)
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
|
||||
def test_post_invalid_ttl(self):
|
||||
sample_messages = [
|
||||
|
|
@ -307,8 +307,8 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(resp['body']['messages'], [])
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
self.assertEqual([], resp['body']['messages'])
|
||||
|
||||
@ddt.data('', '0xdeadbeef', '550893e0-2b6e-11e3-835a-5cf9dd72369')
|
||||
def test_bad_client_id(self, text_id):
|
||||
|
|
@ -331,7 +331,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
action = "message_get"
|
||||
body = {
|
||||
|
|
@ -344,7 +344,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
@ddt.data(None, '[', '[]', '{}', '.')
|
||||
def test_post_bad_message(self, document):
|
||||
|
|
@ -362,7 +362,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
@ddt.data(-1, 59, 1209601)
|
||||
def test_unacceptable_ttl(self, ttl):
|
||||
|
|
@ -378,7 +378,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
def test_exceeded_message_posting(self):
|
||||
# Total (raw request) size
|
||||
|
|
@ -397,7 +397,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
@ddt.data('{"overflow": 9223372036854775808}',
|
||||
'{"underflow": -9223372036854775809}')
|
||||
|
|
@ -416,7 +416,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
def test_delete(self):
|
||||
resp = self._post_messages("tofi")
|
||||
|
|
@ -434,7 +434,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
|
||||
# Delete queue
|
||||
action = "message_delete"
|
||||
|
|
@ -443,7 +443,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
# Get non existent queue
|
||||
action = "message_get"
|
||||
|
|
@ -451,7 +451,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 404)
|
||||
self.assertEqual(404, resp['headers']['status'])
|
||||
|
||||
# Safe to delete non-existing ones
|
||||
action = "message_delete"
|
||||
|
|
@ -459,7 +459,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
def test_bulk_delete(self):
|
||||
resp = self._post_messages("nerds", repeat=5)
|
||||
|
|
@ -477,7 +477,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
action = "message_get"
|
||||
req = test_utils.create_request(action, body, self.headers)
|
||||
|
|
@ -485,7 +485,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
# Safe to delete non-existing ones
|
||||
action = "message_delete_many"
|
||||
|
|
@ -494,7 +494,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
# Even after the queue is gone
|
||||
action = "queue_delete"
|
||||
|
|
@ -503,7 +503,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
action = "message_delete_many"
|
||||
body = {"queue_name": "nerds",
|
||||
|
|
@ -512,7 +512,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
def test_get_nonexistent_message_404s(self):
|
||||
action = "message_get"
|
||||
|
|
@ -526,7 +526,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 404)
|
||||
self.assertEqual(404, resp['headers']['status'])
|
||||
|
||||
def test_get_multiple_invalid_messages_404s(self):
|
||||
action = "message_get_many"
|
||||
|
|
@ -540,7 +540,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
|
||||
self.protocol.onMessage(req, False)
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
|
||||
def test_delete_multiple_invalid_messages_204s(self):
|
||||
action = "message_delete"
|
||||
|
|
@ -555,7 +555,7 @@ class MessagesBaseTest(base.V2Base):
|
|||
self.protocol.onMessage(req, False)
|
||||
|
||||
resp = json.loads(send_mock.call_args[0][0])
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
def _post_messages(self, queue_name, repeat=1):
|
||||
messages = [{'body': 239, 'ttl': 300}] * repeat
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
with mock.patch.object(self.protocol, 'sendMessage') as msg_mock:
|
||||
msg_mock.side_effect = validator
|
||||
|
|
@ -70,7 +70,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 404)
|
||||
self.assertEqual(404, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -89,7 +89,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -106,8 +106,8 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(json.dumps(resp['body']), json.dumps(meta))
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
self.assertEqual(json.dumps(meta), json.dumps(resp['body']))
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -119,7 +119,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -131,7 +131,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -143,7 +143,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 404)
|
||||
self.assertEqual(404, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -171,7 +171,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -181,7 +181,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -206,7 +206,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -216,7 +216,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -240,7 +240,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -266,14 +266,14 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -296,7 +296,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -323,7 +323,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -350,7 +350,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -373,7 +373,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -386,7 +386,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -399,8 +399,8 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(json.dumps(resp['body']), json.dumps(meta1))
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
self.assertEqual(json.dumps(meta1), json.dumps(resp['body']))
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -414,7 +414,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 204)
|
||||
self.assertEqual(204, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -427,8 +427,8 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(json.dumps(resp['body']), json.dumps(meta2))
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
self.assertEqual(json.dumps(meta2), json.dumps(resp['body']))
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -460,8 +460,8 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(resp['body']['queues'], [])
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
self.assertEqual([], resp['body']['queues'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -472,7 +472,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 400)
|
||||
self.assertEqual(400, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -490,7 +490,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 201)
|
||||
self.assertEqual(201, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -507,7 +507,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(len(resp['body']['queues']), 2)
|
||||
self.assertEqual(2, len(resp['body']['queues']))
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -518,9 +518,9 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
# Ensure we didn't pick up the queue from the alt project.
|
||||
self.assertEqual(len(resp['body']['queues']), 3)
|
||||
self.assertEqual(3, len(resp['body']['queues']))
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -531,7 +531,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -542,9 +542,9 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(json.dumps(resp['body']),
|
||||
json.dumps({"node": 31}))
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
self.assertEqual(json.dumps({"node": 31}),
|
||||
json.dumps(resp['body']))
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
@ -556,7 +556,7 @@ class QueueLifecycleBaseTest(base.V2Base):
|
|||
|
||||
def validator(resp, isBinary):
|
||||
resp = json.loads(resp)
|
||||
self.assertEqual(resp['headers']['status'], 200)
|
||||
self.assertEqual(200, resp['headers']['status'])
|
||||
|
||||
send_mock.side_effect = validator
|
||||
self.protocol.onMessage(req, False)
|
||||
|
|
|
|||
Loading…
Reference in New Issue