Merge "catch warnings from error tests"

This commit is contained in:
Jenkins 2015-07-01 14:15:39 +00:00 committed by Gerrit Code Review
commit 1c93a53b7f

View File

@ -218,6 +218,8 @@ class TestPublisher(testscenarios.testcase.WithScenarios,
if self.pub_func == 'publish_events' else
self.CONF.publisher_rpc.metering_topic)
class TestPublisherPolicy(TestPublisher):
def test_published_concurrency(self):
"""Test concurrent access to the local queue of the rpc publisher."""
@ -294,6 +296,10 @@ class TestPublisher(testscenarios.testcase.WithScenarios,
fake_send.assert_called_once_with(
mock.ANY, self.topic, mock.ANY)
@mock.patch('ceilometer.publisher.messaging.LOG', mock.Mock())
class TestPublisherPolicyReactions(TestPublisher):
def test_published_with_policy_drop_and_rpc_down(self):
publisher = self.publisher_cls(
netutils.urlsplit('%s://?policy=drop' % self.protocol))