Merge "Clean deprecated "rpc_backend" in tests"

This commit is contained in:
Jenkins 2016-06-17 02:53:05 +00:00 committed by Gerrit Code Review
commit 40e03d820a
2 changed files with 4 additions and 10 deletions

View File

@ -26,9 +26,7 @@ from aodh.tests import base
class BinTestCase(base.BaseTestCase):
def setUp(self):
super(BinTestCase, self).setUp()
content = ("[DEFAULT]\n"
"rpc_backend=fake\n"
"[database]\n"
content = ("[database]\n"
"connection=log://localhost\n")
if six.PY3:
content = content.encode('utf-8')
@ -56,9 +54,7 @@ class BinTestCase(base.BaseTestCase):
b"time to live is disabled", err)
def test_run_expirer_ttl_enabled(self):
content = ("[DEFAULT]\n"
"rpc_backend=fake\n"
"[database]\n"
content = ("[database]\n"
"alarm_history_time_to_live=1\n"
"connection=log://localhost\n")
if six.PY3:
@ -81,9 +77,7 @@ class BinTestCase(base.BaseTestCase):
class BinEvaluatorTestCase(base.BaseTestCase):
def setUp(self):
super(BinEvaluatorTestCase, self).setUp()
content = ("[DEFAULT]\n"
"rpc_backend=fake\n"
"[database]\n"
content = ("[database]\n"
"connection=log://localhost\n")
if six.PY3:
content = content.encode('utf-8')

View File

@ -60,6 +60,6 @@ class MessagingTests(base.BaseTestCase):
self.assertNotEqual(t1, t2)
def test_get_transport_optional(self):
self.CONF.set_override('rpc_backend', '')
self.CONF.set_override('transport_url', 'non-url')
self.assertIsNone(messaging.get_transport(self.CONF, optional=True,
cache=False))