diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-06-28 15:58:57 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-06-28 15:58:57 +0000 |
| commit | 43fb09ba482df5ed7d6742f5cd678ff0c0536228 (patch) | |
| tree | 155f75cdce0cf421a52063309f946b4af7df7335 | |
| parent | 8871b2baceb81facee7b2da24dce809d3b4df5da (diff) | |
| download | nova-43fb09ba482df5ed7d6742f5cd678ff0c0536228.tar.gz nova-43fb09ba482df5ed7d6742f5cd678ff0c0536228.tar.xz nova-43fb09ba482df5ed7d6742f5cd678ff0c0536228.zip | |
Remove tpool stub in xenapi tests
XenAPI stopped using tpool in commit a3a5f23487e9ca4257551fd3d430d8ebcfca131a
so remove the stubs that are unnecessary now
Change-Id: I709a1b557576471d3b69c2a28f00d25602ed090f
| -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): |