diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-15 21:41:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-15 21:41:35 +0000 |
| commit | f69b0923b8a81bad075d1972cd342d4d018f8170 (patch) | |
| tree | 4588a826118c0aa079a3db49eddcd0349f45bcc2 /nova/tests | |
| parent | 963d24d87d489aaf4270bb7bdc1a4b2cbb02a83b (diff) | |
| parent | e0efd7551d0d4e1c23111419f0622a1994601fda (diff) | |
Merge "Move connection pool back into impl_kombu/qpid."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/rpc/test_qpid.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nova/tests/rpc/test_qpid.py b/nova/tests/rpc/test_qpid.py index 38ecd33d9..61d47fb5d 100644 --- a/nova/tests/rpc/test_qpid.py +++ b/nova/tests/rpc/test_qpid.py @@ -25,7 +25,6 @@ import mox from nova import context from nova import log as logging from nova import test -import nova.rpc.amqp as rpc_amqp try: import qpid @@ -186,10 +185,10 @@ class RpcQpidTestCase(test.TestCase): self.mocker.VerifyAll() finally: - while rpc_amqp.ConnectionContext._connection_pool.free_items: + while impl_qpid.Connection.pool.free_items: # Pull the mock connection object out of the connection pool so # that it doesn't mess up other test cases. - rpc_amqp.ConnectionContext._connection_pool.get() + impl_qpid.Connection.pool.get() @test.skip_if(qpid is None, "Test requires qpid") def test_cast(self): @@ -265,10 +264,10 @@ class RpcQpidTestCase(test.TestCase): self.mocker.VerifyAll() finally: - while rpc_amqp.ConnectionContext._connection_pool.free_items: + while impl_qpid.Connection.pool.free_items: # Pull the mock connection object out of the connection pool so # that it doesn't mess up other test cases. - rpc_amqp.ConnectionContext._connection_pool.get() + impl_qpid.Connection.pool.get() @test.skip_if(qpid is None, "Test requires qpid") def test_call(self): |