womax/nova
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port libvirt test_driver to Python 3

Browse Source 
* Use binary files, not text files, in fake_libvirt_utils.file_open()
* Use byte strings for XML
* Set disk size to 0 in mocks to avoid fix TypeError on comparison
  on Python 3
* Replace filter() and map() with a list-comprehension to get a list
  on Python 3
* Replace six.moves.range() with range() in driver.py: there is
  a "from six.moves import range" import at top level
* Replace six.iteritems(dict) with dict.items() to cleanup the code.
* Make sure call mox.UnsetStubs at last to make mox work properly on
  Python 3.

Co-Authored-By: Davanum Srinivas <davanum@gmail.com>
Co-Authored-By: Victor Stinner <vstinner@redhat.com>

Change-Id: I568c72c611024d32c35dd0629cc041ca5c5969b8
Partially-Implements: blueprint goal-python35
This commit is contained in:
ChangBo Guo(gcb)
2016-11-22 19:35:02 +08:00
parent 9bfeecdd3d
commit 0ae8cbf83e
4 changed files with 64 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nova/tests/unit/virt/libvirt/fake_libvirt_utils.py
+5 -6
View File
@@ -12,14 +12,13 @@
# License for the specific language governing permissions and limitations
# under the License.
import io
import os
from six.moves import StringIO
from nova.virt.libvirt import utils as libvirt_utils
files = {'console.log': True}
files = {'console.log': b''}
disk_sizes = {}
disk_backing_files = {}
disk_type = "qcow2"
@@ -88,15 +87,15 @@ def update_mtime(path):
def extract_snapshot(disk_path, source_fmt, out_path, dest_fmt):
files[out_path] = ''
files[out_path] = b''
class File(object):
def __init__(self, path, mode=None):
if path in files:
self.fp = StringIO(files[path])
self.fp = io.BytesIO(files[path])
else:
self.fp = StringIO(files[os.path.split(path)[-1]])
self.fp = io.BytesIO(files[os.path.split(path)[-1]])
def __enter__(self):
return self.fp
nova/tests/unit/virt/libvirt/test_driver.py
+53 -46
View File
@@ -6262,7 +6262,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
mock_get_domain.assert_called_with(instance)
mock_dom.detachDeviceFlags.assert_called_with(
"""<disk type="file" device="disk">
b"""<disk type="file" device="disk">
<source file="/path/to/fake-volume"/>
<target bus="virtio" dev="vdc"/>
</disk>
@@ -9325,7 +9325,8 @@ class LibvirtConnTestCase(test.NoDBTestCase):
u'virt_disk_size': 25165824}]
with test.nested(
mock.patch.object(imagebackend.Image, 'get_disk_size'),
mock.patch.object(imagebackend.Image, 'get_disk_size',
return_value=0),
mock.patch.object(os.path, 'exists', return_value=True)
):
conn._create_images_and_backing(self.context, instance,
@@ -9352,6 +9353,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
mock.patch.object(imagebackend.Image, 'get_disk_size')
) as (fetch_image_mock, create_ephemeral_mock, verify_base_size_mock,
disk_size_mock):
disk_size_mock.return_value = 0
drvr._create_images_and_backing(self.context, instance,
CONF.instances_path, disk_info)
self.assertEqual(len(create_ephemeral_mock.call_args_list), 1)
@@ -10769,7 +10771,10 @@ class LibvirtConnTestCase(test.NoDBTestCase):
mock.patch.object(drvr, 'get_info'),
mock.patch.object(drvr, '_create_domain_and_network'),
mock.patch.object(imagebackend.Image, 'verify_base_size'),
mock.patch.object(imagebackend.Image, 'get_disk_size')):
mock.patch.object(imagebackend.Image, 'get_disk_size')
) as (execute_mock, get_info_mock,
create_mock, verify_base_size_mock, disk_size_mock):
disk_size_mock.return_value = 0
self.assertRaises(exception.InvalidBDMFormat, drvr._create_image,
context, instance, disk_info['mapping'],
block_device_info=block_device_info)
@@ -10824,7 +10829,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
drvr._create_swap('/dev/something', 1)
def test_get_console_output_file(self):
fake_libvirt_utils.files['console.log'] = '01234567890'
fake_libvirt_utils.files['console.log'] = b'01234567890'
with utils.tempdir() as tmpdir:
self.flags(instances_path=tmpdir)
@@ -10865,7 +10870,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
finally:
libvirt_driver.MAX_CONSOLE_BYTES = prev_max
self.assertEqual('67890', output)
self.assertEqual(b'67890', output)
def test_get_console_output_file_missing(self):
with utils.tempdir() as tmpdir:
@@ -10906,7 +10911,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
@mock.patch('os.path.exists', return_value=True)
def test_get_console_output_pty(self, mocked_path_exists):
fake_libvirt_utils.files['pty'] = '01234567890'
fake_libvirt_utils.files['pty'] = b'01234567890'
with utils.tempdir() as tmpdir:
self.flags(instances_path=tmpdir)
@@ -10954,7 +10959,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
finally:
libvirt_driver.MAX_CONSOLE_BYTES = prev_max
self.assertEqual('67890', output)
self.assertEqual(b'67890', output)
@mock.patch('nova.virt.libvirt.host.Host.get_domain')
@mock.patch.object(libvirt_guest.Guest, "get_xml_desc")
@@ -10982,9 +10987,9 @@ class LibvirtConnTestCase(test.NoDBTestCase):
@mock.patch('nova.virt.libvirt.host.Host.get_domain')
@mock.patch.object(libvirt_guest.Guest, "get_xml_desc")
def test_get_console_output_logrotate(self, mock_get_xml, get_domain):
fake_libvirt_utils.files['console.log'] = 'uvwxyz'
fake_libvirt_utils.files['console.log.0'] = 'klmnopqrst'
fake_libvirt_utils.files['console.log.1'] = 'abcdefghij'
fake_libvirt_utils.files['console.log'] = b'uvwxyz'
fake_libvirt_utils.files['console.log.0'] = b'klmnopqrst'
fake_libvirt_utils.files['console.log.1'] = b'abcdefghij'
def mock_path_exists(path):
return os.path.basename(path) in fake_libvirt_utils.files
@@ -11024,20 +11029,20 @@ class LibvirtConnTestCase(test.NoDBTestCase):
return log_data
# span across only 1 file (with remaining bytes)
self.assertEqual('wxyz', _get_logd_output(4))
self.assertEqual(b'wxyz', _get_logd_output(4))
# span across only 1 file (exact bytes)
self.assertEqual('uvwxyz', _get_logd_output(6))
self.assertEqual(b'uvwxyz', _get_logd_output(6))
# span across 2 files (with remaining bytes)
self.assertEqual('opqrstuvwxyz', _get_logd_output(12))
self.assertEqual(b'opqrstuvwxyz', _get_logd_output(12))
# span across all files (exact bytes)
self.assertEqual('abcdefghijklmnopqrstuvwxyz', _get_logd_output(26))
self.assertEqual(b'abcdefghijklmnopqrstuvwxyz', _get_logd_output(26))
# span across all files with more bytes than available
self.assertEqual('abcdefghijklmnopqrstuvwxyz', _get_logd_output(30))
self.assertEqual(b'abcdefghijklmnopqrstuvwxyz', _get_logd_output(30))
# files are not available
fake_libvirt_utils.files = {}
self.assertEqual('', _get_logd_output(30))
# reset the file for other tests
fake_libvirt_utils.files['console.log'] = '01234567890'
fake_libvirt_utils.files['console.log'] = b'01234567890'
def test_get_host_ip_addr(self):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
@@ -13573,6 +13578,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
drvr.get_host_ip_addr().AndReturn('foo')
self.mox.ReplayAll()
self.assertTrue(drvr._is_storage_shared_with('foo', '/path'))
self.mox.UnsetStubs()
def test_store_pid_remove_pid(self):
instance = objects.Instance(**self.test_instance)
@@ -16586,16 +16592,16 @@ class LibvirtDriverTestCase(test.NoDBTestCase):
# We expect the generated domain to contain disk.rescue and
# disk, in that order
expected_domain_disk_paths = map(
lambda name: disks[name].path, ('disk.rescue', 'disk'))
expected_domain_disk_paths = [disks[name].path for name in
('disk.rescue', 'disk')]
domain_disk_paths = doc.xpath('devices/disk/source/@file')
self.assertEqual(expected_domain_disk_paths, domain_disk_paths)
# The generated domain xml should contain the rescue kernel
# and ramdisk
expected_kernel_ramdisk_paths = map(
lambda disk: os.path.join(CONF.instances_path, disk.path),
kernel_ramdisk)
expected_kernel_ramdisk_paths = [os.path.join(CONF.instances_path,
disk.path) for disk
in kernel_ramdisk]
kernel_ramdisk_paths = \
doc.xpath('os/*[self::initrd|self::kernel]/text()')
self.assertEqual(expected_kernel_ramdisk_paths,
@@ -16630,17 +16636,18 @@ class LibvirtDriverTestCase(test.NoDBTestCase):
# We expect the generated domain to contain disk.rescue, disk, and
# disk.config.rescue in that order
expected_domain_disk_paths = map(
lambda name: disks[name].path, ('disk.rescue', 'disk',
'disk.config.rescue'))
expected_domain_disk_paths = [disks[name].path for name
in ('disk.rescue', 'disk',
'disk.config.rescue')]
domain_disk_paths = doc.xpath('devices/disk/source/@file')
self.assertEqual(expected_domain_disk_paths, domain_disk_paths)
# The generated domain xml should contain the rescue kernel
# and ramdisk
expected_kernel_ramdisk_paths = map(
lambda disk: os.path.join(CONF.instances_path, disk.path),
kernel_ramdisk)
expected_kernel_ramdisk_paths = [os.path.join(CONF.instances_path,
disk.path)
for disk in kernel_ramdisk]
kernel_ramdisk_paths = \
doc.xpath('os/*[self::initrd|self::kernel]/text()')
self.assertEqual(expected_kernel_ramdisk_paths,
@@ -16973,13 +16980,13 @@ class LibvirtDriverTestCase(test.NoDBTestCase):
</domain>
"""
diska_xml = """<disk type="file" device="disk">
diska_xml = b"""<disk type="file" device="disk">
<source file="disk1_file"/>
<target bus="virtio" dev="vda"/>
<serial>0e38683e-f0af-418f-a3f1-6b67ea0f919d</serial>
</disk>"""
diskb_xml = """<disk type="block" device="disk">
diskb_xml = b"""<disk type="block" device="disk">
<source dev="/path/to/dev/1"/>
<target bus="virtio" dev="vdb"/>
</disk>"""
@@ -17476,14 +17483,14 @@ class LibvirtVolumeSnapshotTestCase(test.NoDBTestCase):
domain.XMLDesc(flags=0).AndReturn(self.dom_xml)
snap_xml_src = (
'<domainsnapshot>\n'
' <disks>\n'
' <disk name="disk1_file" snapshot="external" type="file">\n'
' <source file="new-file"/>\n'
' </disk>\n'
' <disk name="vdb" snapshot="no"/>\n'
' </disks>\n'
'</domainsnapshot>\n')
b'<domainsnapshot>\n'
b' <disks>\n'
b' <disk name="disk1_file" snapshot="external" type="file">\n'
b' <source file="new-file"/>\n'
b' </disk>\n'
b' <disk name="vdb" snapshot="no"/>\n'
b' </disks>\n'
b'</domainsnapshot>\n')
# Older versions of libvirt may be missing these.
fakelibvirt.VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT = 32
@@ -17546,14 +17553,14 @@ class LibvirtVolumeSnapshotTestCase(test.NoDBTestCase):
domain.XMLDesc(flags=0).AndReturn(self.dom_xml)
snap_xml_src = (
'<domainsnapshot>\n'
' <disks>\n'
' <disk name="disk1_file" snapshot="external" type="file">\n'
' <source file="new-file"/>\n'
' </disk>\n'
' <disk name="vdb" snapshot="no"/>\n'
' </disks>\n'
'</domainsnapshot>\n')
b'<domainsnapshot>\n'
b' <disks>\n'
b' <disk name="disk1_file" snapshot="external" type="file">\n'
b' <source file="new-file"/>\n'
b' </disk>\n'
b' <disk name="vdb" snapshot="no"/>\n'
b' </disks>\n'
b'</domainsnapshot>\n')
# Older versions of libvirt may be missing these.
fakelibvirt.VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT = 32
@@ -18288,7 +18295,7 @@ class LibvirtVolumeSnapshotTestCase(test.NoDBTestCase):
def _fake_convert_image(source, dest, in_format, out_format,
run_as_root=True):
libvirt_driver.libvirt_utils.files[dest] = ''
libvirt_driver.libvirt_utils.files[dest] = b''
class _BaseSnapshotTests(test.NoDBTestCase):
nova/virt/libvirt/driver.py
+6 -6
View File
@@ -1071,8 +1071,8 @@ class LibvirtDriver(driver.ComputeDriver):
logical_volumes = lvm.list_volumes(vg)
disk_names = filter(belongs_to_instance, logical_volumes)
disks = map(fullpath, disk_names)
disks = [fullpath(disk) for disk in logical_volumes
if belongs_to_instance(disk)]
return disks
return []
@@ -2410,7 +2410,7 @@ class LibvirtDriver(driver.ComputeDriver):
guest.shutdown()
retry_countdown = retry_interval
for sec in six.moves.range(timeout):
for sec in range(timeout):
guest = self._host.get_guest(instance)
state = guest.get_power_state(self._host)
@@ -2675,7 +2675,7 @@ class LibvirtDriver(driver.ComputeDriver):
def _get_console_output_file(self, instance, console_log):
bytes_to_read = MAX_CONSOLE_BYTES
log_data = "" # The last N read bytes
log_data = b"" # The last N read bytes
i = 0 # in case there is a log rotation (like "virtlogd")
path = console_log
while bytes_to_read > 0 and os.path.exists(path):
@@ -5013,7 +5013,7 @@ class LibvirtDriver(driver.ComputeDriver):
else:
info = libvirt_utils.get_fs_info(CONF.instances_path)
for (k, v) in six.iteritems(info):
for (k, v) in info.items():
info[k] = v / units.Gi
return info
@@ -7712,7 +7712,7 @@ class LibvirtDriver(driver.ComputeDriver):
# state is not None and the task state should be set to something
# other than None by the time this method is invoked.
target_del = target + '_del'
for i in six.moves.range(2):
for i in range(2):
try:
utils.execute('mv', target, target_del)
break
tests-py3.txt
-3
View File
@@ -38,9 +38,6 @@ nova.tests.unit.test_matchers.TestDictMatches.test__str__
nova.tests.unit.test_wsgi.TestWSGIServerWithSSL
nova.tests.unit.virt.disk.mount.test_nbd.NbdTestCase
nova.tests.unit.virt.libvirt.storage.test_rbd.RbdTestCase
nova.tests.unit.virt.libvirt.test_driver.LibvirtConnTestCase
nova.tests.unit.virt.libvirt.test_driver.LibvirtDriverTestCase
nova.tests.unit.virt.libvirt.test_driver.LibvirtVolumeSnapshotTestCase
nova.tests.unit.virt.libvirt.test_firewall.IptablesFirewallTestCase
nova.tests.unit.virt.libvirt.test_imagebackend.EncryptedLvmTestCase
nova.tests.unit.virt.libvirt.test_imagebackend.LvmTestCase