diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-28 17:48:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-28 17:48:33 +0000 |
| commit | 7f4ec4054e77d424c8142847e86eff0cd6d14c37 (patch) | |
| tree | 84660fc79c9ec1f4c6573a07c41f8bca740c456e /nova | |
| parent | 49504a349ee7ce7e0956b7aed208442284bd0ef1 (diff) | |
| parent | 43fb09ba482df5ed7d6742f5cd678ff0c0536228 (diff) | |
Merge "Remove tpool stub in xenapi tests"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/xenapi/stubs.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py index 47b950e01..2b3722f62 100644 --- a/nova/tests/xenapi/stubs.py +++ b/nova/tests/xenapi/stubs.py @@ -17,8 +17,6 @@ import random -from eventlet import tpool - from nova.openstack.common import jsonutils import nova.tests.image.fake from nova.virt.xenapi import connection as xenapi_conn @@ -66,11 +64,6 @@ def stubout_session(stubs, cls, product_version=(5, 6, 2), **opt_args): fake_import) stubs.Set(xenapi_conn.XenAPISession, '_get_product_version', lambda s: product_version) - # NOTE(johannes): logging can't be used reliably from a thread - # since it can deadlock with eventlet. It's safe for our faked - # sessions to be called synchronously in the unit tests. (see - # bug 946687) - stubs.Set(tpool, 'execute', lambda m, *a, **kw: m(*a, **kw)) def stubout_get_this_vm_uuid(stubs): |