Merge "Let v2 tempest base on the base tests"

This commit is contained in:
Jenkins 2016-08-29 01:29:13 +00:00 committed by Gerrit Code Review
commit 678fcdd36b
2 changed files with 18 additions and 3 deletions

View File

@ -197,8 +197,8 @@ class BaseV11MessagingTest(BaseMessagingTest):
return rbody
class BaseV2MessagingTest(BaseV11MessagingTest):
"""Base class for the Messaging (Zaqar) v1.1 tests."""
class BaseV2MessagingTest(BaseMessagingTest):
"""Base class for the Messaging (Zaqar) v2 tests."""
@classmethod
def setup_clients(cls):
super(BaseV2MessagingTest, cls).setup_clients()
@ -251,3 +251,18 @@ class BaseV2MessagingTest(BaseV11MessagingTest):
rbody = [{'options': option_body, 'ttl': message_ttl,
'subscriber': subscriber} for subscriber in subscribers]
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

View File

@ -22,7 +22,7 @@ from testtools import matchers
from zaqar.tests.tempest_plugin.tests import base
class TestQueues(base.BaseV11MessagingTest):
class TestQueues(base.BaseV2MessagingTest):
@decorators.idempotent_id('f2db96f3-fa02-426a-9b42-5806e12f14d4')
def test_create_delete_queue(self):