diff options
| author | Max Reitz <mreitz@redhat.com> | 2015-09-02 20:52:26 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-09-04 20:59:48 +0200 |
| commit | 0ed82f7a096537923ef3705946f254d2f61eaf93 (patch) | |
| tree | d067f0f573a40ebbabb2f764c6d8c39b348c5962 /tests/qemu-iotests/041 | |
| parent | 8e4922535b6479c7a2fa6b14b0148c6ae4fcc003 (diff) | |
| download | qemu-0ed82f7a096537923ef3705946f254d2f61eaf93.tar.gz | |
iotests: Respect -nodefaults in tests 41 and 55
While -nodefaults is set in $QEMU_OPTIONS, this is currently (wrongly)
ignored for Python iotests. In order to be prepared for when this is
fixed, we should explicitly add an IDE CD-ROM drive instead of relying
on it being created automatically.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/041')
| -rwxr-xr-x | tests/qemu-iotests/041 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index de8ea1588b..38ca5f13c7 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -42,6 +42,8 @@ class TestSingleDrive(iotests.QMPTestCase): iotests.create_image(backing_img, self.image_len) qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % backing_img, test_img) self.vm = iotests.VM().add_drive(test_img) + if iotests.qemu_default_machine == 'pc': + self.vm.add_drive(None, 'media=cdrom', 'ide') self.vm.launch() def tearDown(self): @@ -170,8 +172,8 @@ class TestSingleDrive(iotests.QMPTestCase): if iotests.qemu_default_machine != 'pc': return - result = self.vm.qmp('drive-mirror', device='ide1-cd0', sync='full', - target=target_img) + result = self.vm.qmp('drive-mirror', device='drive1', # CD-ROM + sync='full', target=target_img) self.assert_qmp(result, 'error/class', 'GenericError') def test_image_not_found(self): @@ -710,6 +712,9 @@ class TestRepairQuorum(iotests.QMPTestCase): def setUp(self): self.vm = iotests.VM() + if iotests.qemu_default_machine == 'pc': + self.vm.add_drive(None, 'media=cdrom', 'ide') + # Add each individual quorum images for i in self.IMAGES: qemu_img('create', '-f', iotests.imgfmt, i, @@ -837,7 +842,8 @@ class TestRepairQuorum(iotests.QMPTestCase): if iotests.qemu_default_machine != 'pc': return - result = self.vm.qmp('drive-mirror', device='ide1-cd0', sync='full', + result = self.vm.qmp('drive-mirror', device='drive0', # CD-ROM + sync='full', node_name='repair0', replaces='img1', target=quorum_repair_img, format=iotests.imgfmt) |