x/python-ganttclient
Code Issues Proposed changes

Merge "Remove tpool stub in xenapi tests"

Browse Source
This commit is contained in:
Jenkins
2012-06-28 17:48:33 +00:00
committed by Gerrit Code Review
parent 853714a14d 7949446f04
commit 321106e5d6
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nova/tests/xenapi/stubs.py
View File

@@ -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):