diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-05 00:47:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-05 00:47:26 +0000 |
| commit | aefdd01621c7e43ba93c91f9db852caf2a08935b (patch) | |
| tree | 09ffefe32938189e99190743dfdd4dc95bc6a670 /openstack/common/rpc/amqp.py | |
| parent | a08daf15d42890a16af0a60ceadd0aaced04ef7f (diff) | |
| parent | 70942a357f992ec3efd820bc0736baa276c31660 (diff) | |
| download | oslo-aefdd01621c7e43ba93c91f9db852caf2a08935b.tar.gz oslo-aefdd01621c7e43ba93c91f9db852caf2a08935b.tar.xz oslo-aefdd01621c7e43ba93c91f9db852caf2a08935b.zip | |
Merge "Ensure proxy callback threads exit during tests"
Diffstat (limited to 'openstack/common/rpc/amqp.py')
| -rw-r--r-- | openstack/common/rpc/amqp.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/openstack/common/rpc/amqp.py b/openstack/common/rpc/amqp.py index ce4c028..c32815d 100644 --- a/openstack/common/rpc/amqp.py +++ b/openstack/common/rpc/amqp.py @@ -293,6 +293,10 @@ class ProxyCallback(object): ctxt.reply(None, sys.exc_info(), connection_pool=self.connection_pool) + def wait(self): + """Wait for all callback threads to exit.""" + self.pool.waitall() + class MulticallWaiter(object): def __init__(self, conf, connection, timeout): |