From 8e0dd9763aba67bb7094cf92312daeba8d087866 Mon Sep 17 00:00:00 2001 From: wangxiyuan Date: Thu, 8 Mar 2018 14:55:36 +0800 Subject: [PATCH] Fix assert error during queue creating in ut In some concurrent test case, the queue may be created more than one time in the setup function. Since the queue in Zaqar is lazy, it returns 201 or 204 in this case. Change-Id: I1c8163a5cfb10071650b5ae16cc53d61503621a2 Closes-bug: #1753997 --- zaqar/tests/unit/transport/websocket/v2/test_claims.py | 2 +- zaqar/tests/unit/transport/websocket/v2/test_messages.py | 2 +- zaqar/tests/unit/transport/websocket/v2/test_subscriptions.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zaqar/tests/unit/transport/websocket/v2/test_claims.py b/zaqar/tests/unit/transport/websocket/v2/test_claims.py index 5fb8bd26f..6bd2b665f 100644 --- a/zaqar/tests/unit/transport/websocket/v2/test_claims.py +++ b/zaqar/tests/unit/transport/websocket/v2/test_claims.py @@ -47,7 +47,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(201, resp['headers']['status']) + self.assertIn(resp['headers']['status'], [201, 204]) action = consts.MESSAGE_POST body = {"queue_name": "skittle", diff --git a/zaqar/tests/unit/transport/websocket/v2/test_messages.py b/zaqar/tests/unit/transport/websocket/v2/test_messages.py index dad982e1c..26a12c0f9 100644 --- a/zaqar/tests/unit/transport/websocket/v2/test_messages.py +++ b/zaqar/tests/unit/transport/websocket/v2/test_messages.py @@ -53,7 +53,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(201, resp['headers']['status']) + self.assertIn(resp['headers']['status'], [201, 204]) def tearDown(self): super(MessagesBaseTest, self).tearDown() diff --git a/zaqar/tests/unit/transport/websocket/v2/test_subscriptions.py b/zaqar/tests/unit/transport/websocket/v2/test_subscriptions.py index 777bef5bf..3d3fc7df4 100644 --- a/zaqar/tests/unit/transport/websocket/v2/test_subscriptions.py +++ b/zaqar/tests/unit/transport/websocket/v2/test_subscriptions.py @@ -48,7 +48,7 @@ class SubscriptionTest(base.V1_1Base): def validator(resp, isBinary): resp = json.loads(resp) - self.assertEqual(resp['headers']['status'], 201) + self.assertIn(resp['headers']['status'], [201, 204]) with mock.patch.object(self.protocol, 'sendMessage') as msg_mock: msg_mock.side_effect = validator