Merge "Port virt.xenapi.client.test_session to Python 3"

This commit is contained in:
Jenkins 2016-12-12 17:20:56 +00:00 committed by Gerrit Code Review
commit b3172acfb3
2 changed files with 2 additions and 1 deletions

View File

@ -22,6 +22,7 @@ from nova import exception
from nova.tests.unit.virt.xenapi import stubs
from nova import version
from nova.virt.xenapi.client import session
from nova.virt.xenapi import fake as xenapi_fake
class SessionTestCase(stubs.XenAPITestBaseNoDB):
@ -204,6 +205,7 @@ class CallPluginTestCase(stubs.XenAPITestBaseNoDB):
def __init__(self, **kwargs):
"Skip the superclass's dirty init"
self.XenAPI = mock.MagicMock()
self.XenAPI.Failure = xenapi_fake.Failure
return FakeXapiSession()

View File

@ -24,7 +24,6 @@ nova.tests.unit.virt.libvirt.test_vif.LibvirtVifTestCase
nova.tests.unit.virt.vmwareapi.test_images.VMwareImagesTestCase
nova.tests.unit.virt.vmwareapi.test_read_write_util.ReadWriteUtilTestCase
nova.tests.unit.virt.vmwareapi.test_vmops.VMwareVMOpsTestCase.test_spawn_mask_block_device_info_password
nova.tests.unit.virt.xenapi.client.test_session.CallPluginTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.ResizeFunctionTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.ScanSrTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.UnplugVbdTestCase