openstack/nova
Code Issues Proposed changes

Merge "Be more explicit about emptying connection pool."

Browse Source
This commit is contained in:
Jenkins 2012-01-31 18:56:08 +00:00 committed by Gerrit Code Review
commit fe56d3c6ba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/rpc/test_qpid.py
View File

@ -186,7 +186,7 @@ class RpcQpidTestCase(test.TestCase):
self.mocker.VerifyAll()
finally:
if rpc_amqp.ConnectionContext._connection_pool.free():
while rpc_amqp.ConnectionContext._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()
@ -261,7 +261,7 @@ class RpcQpidTestCase(test.TestCase):
self.mocker.VerifyAll()
finally:
if rpc_amqp.ConnectionContext._connection_pool.free():
while rpc_amqp.ConnectionContext._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()