From 7949446f04acb0215548406316ca42890f236fbc Mon Sep 17 00:00:00 2001 From: Johannes Erdfelt Date: Thu, 28 Jun 2012 15:58:57 +0000 Subject: [PATCH] Remove tpool stub in xenapi tests XenAPI stopped using tpool in commit a3a5f23487e9ca4257551fd3d430d8ebcfca131a so remove the stubs that are unnecessary now Change-Id: I709a1b557576471d3b69c2a28f00d25602ed090f --- nova/tests/xenapi/stubs.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py index 47b950e0..2b3722f6 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):