openstack/nova
Code Issues Proposed changes

Merge "XenAPI: Fix unit tests for python34"

Browse Source
This commit is contained in:
Jenkins 2015-10-07 20:48:10 +00:00 committed by Gerrit Code Review
commit e58210cb2a
2 changed files with 4 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/virt/xenapi/fake.py
View File

@ -121,7 +121,7 @@ def create_network(name_label, bridge):
def create_vm(name_label, status, **kwargs): def create_vm(name_label, status, **kwargs):
if status == 'Running': if status == 'Running':
domid = random.randrange(1, 1 << 16) domid = random.randrange(1, 1 << 16)
resident_on = _db_content['host'].keys()[0] resident_on = list(_db_content['host'])[0]
else: else:
domid = -1 domid = -1
resident_on = '' resident_on = ''
@ -343,7 +343,7 @@ def _create_sr(table, obj):
# Forces fake to support iscsi only # Forces fake to support iscsi only
if sr_type != 'iscsi' and sr_type != 'nfs': if sr_type != 'iscsi' and sr_type != 'nfs':
raise Failure(['SR_UNKNOWN_DRIVER', sr_type]) raise Failure(['SR_UNKNOWN_DRIVER', sr_type])
host_ref = _db_content['host'].keys()[0] host_ref = list(_db_content['host'])[0]
sr_ref = _create_object(table, obj[2]) sr_ref = _create_object(table, obj[2])
if sr_type == 'iscsi': if sr_type == 'iscsi':
vdi_ref = create_vdi('', sr_ref) vdi_ref = create_vdi('', sr_ref)
@ -854,7 +854,7 @@ class SessionBase(object):
def _login(self, method, params): def _login(self, method, params):
self._session = str(uuid.uuid4()) self._session = str(uuid.uuid4())
_session_info = {'uuid': str(uuid.uuid4()), _session_info = {'uuid': str(uuid.uuid4()),
'this_host': _db_content['host'].keys()[0]} 'this_host': list(_db_content['host'])[0]}
_db_content['session'][self._session] = _session_info _db_content['session'][self._session] = _session_info
def _logout(self): def _logout(self):

58
tests-py3.txt
View File

@ -353,93 +353,35 @@ nova.tests.unit.virt.vmwareapi.test_vm_util.VMwareVMUtilGetHostRefTestCase
nova.tests.unit.virt.vmwareapi.test_vm_util.VMwareVMUtilTestCase nova.tests.unit.virt.vmwareapi.test_vm_util.VMwareVMUtilTestCase
nova.tests.unit.virt.vmwareapi.test_vmops.VMwareVMOpsTestCase nova.tests.unit.virt.vmwareapi.test_vmops.VMwareVMOpsTestCase
nova.tests.unit.virt.vmwareapi.test_volumeops.VMwareVolumeOpsTestCase nova.tests.unit.virt.vmwareapi.test_volumeops.VMwareVolumeOpsTestCase
nova.tests.unit.virt.xenapi.client.test_objects.ObjectsTestCase
nova.tests.unit.virt.xenapi.client.test_objects.VBDTestCase
nova.tests.unit.virt.xenapi.client.test_objects.XenAPISessionObjectTestCase
nova.tests.unit.virt.xenapi.client.test_session.ApplySessionHelpersTestCase nova.tests.unit.virt.xenapi.client.test_session.ApplySessionHelpersTestCase
nova.tests.unit.virt.xenapi.client.test_session.CallPluginTestCase nova.tests.unit.virt.xenapi.client.test_session.CallPluginTestCase
nova.tests.unit.virt.xenapi.client.test_session.SessionTestCase nova.tests.unit.virt.xenapi.client.test_session.SessionTestCase
nova.tests.unit.virt.xenapi.image.test_bittorrent.TestBittorrentStore
nova.tests.unit.virt.xenapi.image.test_glance.TestGlanceStore
nova.tests.unit.virt.xenapi.image.test_utils.RawTGZTestCase nova.tests.unit.virt.xenapi.image.test_utils.RawTGZTestCase
nova.tests.unit.virt.xenapi.image.test_vdi_through_dev.TestTarGzProducer nova.tests.unit.virt.xenapi.image.test_vdi_through_dev.TestTarGzProducer
nova.tests.unit.virt.xenapi.image.test_vdi_through_dev.TestUploadToGlanceAsRawTgz nova.tests.unit.virt.xenapi.image.test_vdi_through_dev.TestUploadToGlanceAsRawTgz
nova.tests.unit.virt.xenapi.test_agent.FileInjectionTestCase nova.tests.unit.virt.xenapi.test_agent.FileInjectionTestCase
nova.tests.unit.virt.xenapi.test_driver.XenAPIDriverTestCase nova.tests.unit.virt.xenapi.test_driver.XenAPIDriverTestCase
nova.tests.unit.virt.xenapi.test_network_utils.NetworkUtilsTestCase nova.tests.unit.virt.xenapi.test_network_utils.NetworkUtilsTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.BittorrentTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.CallXenAPIHelpersTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.CheckVDISizeTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.CreateCachedImageTestCase nova.tests.unit.virt.xenapi.test_vm_utils.CreateCachedImageTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.CreateKernelRamdiskTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.CreateVBDTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.CreateVmRecordTestCase nova.tests.unit.virt.xenapi.test_vm_utils.CreateVmRecordTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.CreateVmTestCase nova.tests.unit.virt.xenapi.test_vm_utils.CreateVmTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.DetermineVmModeTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.DeviceIdTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.FetchVhdImageTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.GenerateConfigDriveTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.GenerateDiskTestCase nova.tests.unit.virt.xenapi.test_vm_utils.GenerateDiskTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.GenerateEphemeralTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.GetAllVdiForVMTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.GetAllVdisTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.GetInstanceForVdisForSrTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.GetVdiForVMTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.ImportMigratedDisksTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.LookupTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.MigrateVHDTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.ResizeFunctionTestCase nova.tests.unit.virt.xenapi.test_vm_utils.ResizeFunctionTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.ResizeHelpersTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.ScanSrTestCase nova.tests.unit.virt.xenapi.test_vm_utils.ScanSrTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.ShutdownTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.SnapshotAttachedHereTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.StreamDiskTestCase nova.tests.unit.virt.xenapi.test_vm_utils.StreamDiskTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.StripBaseMirrorTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.TestImageCompression
nova.tests.unit.virt.xenapi.test_vm_utils.UnplugVbdTestCase nova.tests.unit.virt.xenapi.test_vm_utils.UnplugVbdTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.VDIAttachedHere
nova.tests.unit.virt.xenapi.test_vm_utils.VDIOtherConfigTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.VMInfoTests nova.tests.unit.virt.xenapi.test_vm_utils.VMInfoTests
nova.tests.unit.virt.xenapi.test_vm_utils.VMRefOrRaiseVMFoundTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.VMRefOrRaiseVMNotFoundTestCase
nova.tests.unit.virt.xenapi.test_vm_utils.VMUtilsSRPath nova.tests.unit.virt.xenapi.test_vm_utils.VMUtilsSRPath
nova.tests.unit.virt.xenapi.test_vm_utils.XenAPIGetUUID
nova.tests.unit.virt.xenapi.test_vmops.BootableTestCase
nova.tests.unit.virt.xenapi.test_vmops.CleanupFailedSnapshotTestCase
nova.tests.unit.virt.xenapi.test_vmops.CreateVMRecordTestCase
nova.tests.unit.virt.xenapi.test_vmops.DestroyTestCase
nova.tests.unit.virt.xenapi.test_vmops.GetConsoleOutputTestCase nova.tests.unit.virt.xenapi.test_vmops.GetConsoleOutputTestCase
nova.tests.unit.virt.xenapi.test_vmops.GetVdisForInstanceTestCase
nova.tests.unit.virt.xenapi.test_vmops.InjectAutoDiskConfigTestCase
nova.tests.unit.virt.xenapi.test_vmops.LiveMigrateFakeVersionTestCase
nova.tests.unit.virt.xenapi.test_vmops.LiveMigrateHelperTestCase
nova.tests.unit.virt.xenapi.test_vmops.MigrateDiskAndPowerOffTestCase
nova.tests.unit.virt.xenapi.test_vmops.MigrateDiskResizingDownTestCase
nova.tests.unit.virt.xenapi.test_vmops.MigrateDiskResizingUpTestCase
nova.tests.unit.virt.xenapi.test_vmops.ResizeVdisTestCase
nova.tests.unit.virt.xenapi.test_vmops.RollbackLiveMigrateDestinationTestCase
nova.tests.unit.virt.xenapi.test_vmops.SpawnTestCase
nova.tests.unit.virt.xenapi.test_vmops.VMOpsTestCase
nova.tests.unit.virt.xenapi.test_vmops.XenstoreCallsTestCase
nova.tests.unit.virt.xenapi.test_volume_utils.BootedFromVolumeTestCase
nova.tests.unit.virt.xenapi.test_volume_utils.FindVBDTestCase
nova.tests.unit.virt.xenapi.test_volume_utils.ISCSIParametersTestCase
nova.tests.unit.virt.xenapi.test_volume_utils.IntroduceTestCase
nova.tests.unit.virt.xenapi.test_volume_utils.ParseVolumeInfoTestCase nova.tests.unit.virt.xenapi.test_volume_utils.ParseVolumeInfoTestCase
nova.tests.unit.virt.xenapi.test_volume_utils.SROps nova.tests.unit.virt.xenapi.test_volume_utils.SROps
nova.tests.unit.virt.xenapi.test_volumeops.AttachVolumeTestCase
nova.tests.unit.virt.xenapi.test_volumeops.CleanupFromVDIsTestCase
nova.tests.unit.virt.xenapi.test_volumeops.FindBadVolumeTestCase
nova.tests.unit.virt.xenapi.test_volumeops.VolumeDetachTestCase
nova.tests.unit.virt.xenapi.test_xenapi.HypervisorPoolTestCase nova.tests.unit.virt.xenapi.test_xenapi.HypervisorPoolTestCase
nova.tests.unit.virt.xenapi.test_xenapi.XenAPIAggregateTestCase nova.tests.unit.virt.xenapi.test_xenapi.XenAPIAggregateTestCase
nova.tests.unit.virt.xenapi.test_xenapi.XenAPIAutoDiskConfigTestCase nova.tests.unit.virt.xenapi.test_xenapi.XenAPIAutoDiskConfigTestCase
nova.tests.unit.virt.xenapi.test_xenapi.XenAPIBWCountersTestCase nova.tests.unit.virt.xenapi.test_xenapi.XenAPIBWCountersTestCase
nova.tests.unit.virt.xenapi.test_xenapi.XenAPIDiffieHellmanTestCase nova.tests.unit.virt.xenapi.test_xenapi.XenAPIDiffieHellmanTestCase
nova.tests.unit.virt.xenapi.test_xenapi.XenAPIDom0IptablesFirewallTestCase nova.tests.unit.virt.xenapi.test_xenapi.XenAPIDom0IptablesFirewallTestCase
nova.tests.unit.virt.xenapi.test_xenapi.XenAPIGenerateLocal
nova.tests.unit.virt.xenapi.test_xenapi.XenAPIHostTestCase nova.tests.unit.virt.xenapi.test_xenapi.XenAPIHostTestCase
nova.tests.unit.virt.xenapi.test_xenapi.XenAPIInjectMetadataTestCase
nova.tests.unit.virt.xenapi.test_xenapi.XenAPILiveMigrateTestCase nova.tests.unit.virt.xenapi.test_xenapi.XenAPILiveMigrateTestCase
nova.tests.unit.virt.xenapi.test_xenapi.XenAPIMigrateInstance nova.tests.unit.virt.xenapi.test_xenapi.XenAPIMigrateInstance
nova.tests.unit.virt.xenapi.test_xenapi.XenAPISRSelectionTestCase nova.tests.unit.virt.xenapi.test_xenapi.XenAPISRSelectionTestCase