Merge "Let v2 tempest base on the base tests"
This commit is contained in:
commit
ad69a22eb5
@ -197,8 +197,8 @@ class BaseV11MessagingTest(BaseMessagingTest):
|
|||||||
return rbody
|
return rbody
|
||||||
|
|
||||||
|
|
||||||
class BaseV2MessagingTest(BaseV11MessagingTest):
|
class BaseV2MessagingTest(BaseMessagingTest):
|
||||||
"""Base class for the Messaging (Zaqar) v1.1 tests."""
|
"""Base class for the Messaging (Zaqar) v2 tests."""
|
||||||
@classmethod
|
@classmethod
|
||||||
def setup_clients(cls):
|
def setup_clients(cls):
|
||||||
super(BaseV2MessagingTest, cls).setup_clients()
|
super(BaseV2MessagingTest, cls).setup_clients()
|
||||||
@ -251,3 +251,18 @@ class BaseV2MessagingTest(BaseV11MessagingTest):
|
|||||||
rbody = [{'options': option_body, 'ttl': message_ttl,
|
rbody = [{'options': option_body, 'ttl': message_ttl,
|
||||||
'subscriber': subscriber} for subscriber in subscribers]
|
'subscriber': subscriber} for subscriber in subscribers]
|
||||||
return rbody
|
return rbody
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def generate_message_body(cls, repeat=1):
|
||||||
|
"""Wrapper utility that sets the metadata of a queue."""
|
||||||
|
message_ttl = data_utils.\
|
||||||
|
rand_int_id(start=60, end=CONF.messaging.max_message_ttl)
|
||||||
|
|
||||||
|
key = data_utils.arbitrary_string(size=20, base_text='MessagingKey')
|
||||||
|
value = data_utils.arbitrary_string(size=20,
|
||||||
|
base_text='MessagingValue')
|
||||||
|
message_body = {key: value}
|
||||||
|
|
||||||
|
body = ([{'body': message_body, 'ttl': message_ttl}] * repeat)
|
||||||
|
rbody = {'messages': body}
|
||||||
|
return rbody
|
||||||
|
@ -22,7 +22,7 @@ from testtools import matchers
|
|||||||
from zaqar.tests.tempest_plugin.tests import base
|
from zaqar.tests.tempest_plugin.tests import base
|
||||||
|
|
||||||
|
|
||||||
class TestQueues(base.BaseV11MessagingTest):
|
class TestQueues(base.BaseV2MessagingTest):
|
||||||
|
|
||||||
@decorators.idempotent_id('f2db96f3-fa02-426a-9b42-5806e12f14d4')
|
@decorators.idempotent_id('f2db96f3-fa02-426a-9b42-5806e12f14d4')
|
||||||
def test_create_delete_queue(self):
|
def test_create_delete_queue(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user