From 16ad97c13fb296125a843d1dda31900994628727 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 6 Sep 2012 14:37:52 -0400 Subject: Make projects define 'control_exchange'. The 'control_exchange' option needs to have a project-specific default value. Just don't register this option and expect it to be registered by the project using this code, at least for now. ****** IMPORTANT NOTE WHEN IMPORTING THIS CHANGE ****** If you are importing this change into a project that uses rpc, you must add the control_exchange option in your code! ******************************************************* Change-Id: Ida5a8637c419e709bbf22fcad57b0f11c31bb959 --- tests/unit/rpc/test_qpid.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/rpc/test_qpid.py b/tests/unit/rpc/test_qpid.py index 7cff645..4e0cc29 100644 --- a/tests/unit/rpc/test_qpid.py +++ b/tests/unit/rpc/test_qpid.py @@ -133,7 +133,7 @@ class RpcQpidTestCase(unittest.TestCase): '"name": "impl_qpid_test_fanout_.*"}}$') else: expected_address = ( - 'nova/impl_qpid_test ; {"node": {"x-declare": ' + 'openstack/impl_qpid_test ; {"node": {"x-declare": ' '{"auto-delete": true, "durable": true}, "type": "topic"}, ' '"create": "always", "link": {"x-declare": {"auto-delete": ' 'true, "exclusive": false, "durable": false}, "durable": ' @@ -169,7 +169,7 @@ class RpcQpidTestCase(unittest.TestCase): self.mock_connection.open() self.mock_connection.session().AndReturn(self.mock_session) expected_address = ( - 'nova/impl_qpid_test ; {"node": {"x-declare": ' + 'openstack/impl_qpid_test ; {"node": {"x-declare": ' '{"auto-delete": true, "durable": true}, "type": "topic"}, ' '"create": "always", "link": {"x-declare": {"auto-delete": ' 'true, "exclusive": false, "durable": false}, "durable": ' @@ -205,7 +205,7 @@ class RpcQpidTestCase(unittest.TestCase): '"type": "topic"}, "create": "always"}') else: expected_address = ( - 'nova/impl_qpid_test ; {"node": {"x-declare": ' + 'openstack/impl_qpid_test ; {"node": {"x-declare": ' '{"auto-delete": true, "durable": false}, "type": "topic"}, ' '"create": "always"}') self.mock_session.sender(expected_address).AndReturn(self.mock_sender) @@ -303,7 +303,7 @@ class RpcQpidTestCase(unittest.TestCase): self.mock_session.receiver(rcv_addr).AndReturn(self.mock_receiver) self.mock_receiver.capacity = 1 send_addr = ( - 'nova/impl_qpid_test ; {"node": {"x-declare": ' + 'openstack/impl_qpid_test ; {"node": {"x-declare": ' '{"auto-delete": true, "durable": false}, "type": "topic"}, ' '"create": "always"}') self.mock_session.sender(send_addr).AndReturn(self.mock_sender) -- cgit