Merge "Use pop in message_delete_many"

This commit is contained in:
Jenkins 2017-01-09 02:30:19 +00:00 committed by Gerrit Code Review
commit 0cd68efaf5
2 changed files with 2 additions and 3 deletions
zaqar
api/v2
tests/unit/transport/websocket/v2

@ -563,7 +563,7 @@ class Endpoints(object):
project_id = req._headers.get('X-Project-ID')
queue_name = req._body.get('queue_name')
message_ids = req._body.get('message_ids')
pop_limit = req._body.get('pop_limit')
pop_limit = req._body.get('pop')
LOG.debug(u'Messages collection DELETE - queue: %(queue)s,'
u'project: %(project)s, messages: %(message_ids)s',

@ -522,8 +522,7 @@ class MessagesBaseTest(base.V2Base):
self._post_messages("kitkat", repeat=5)
action = consts.MESSAGE_DELETE_MANY
body = {"queue_name": "kitkat",
"pop_limit": 2}
body = {"queue_name": "kitkat", "pop": 2}
send_mock = mock.Mock()
self.protocol.sendMessage = send_mock