Commit 0ed82f7a authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

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: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 8e492253

tests/qemu-iotests/041

+9 −3
Original line number Diff line number Diff line
@@ -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)

tests/qemu-iotests/055

+7 −3
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ class TestSingleDrive(iotests.QMPTestCase): 
        qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img, str(TestSingleDrive.image_len))



        self.vm = iotests.VM().add_drive(test_img).add_drive(blockdev_target_img)

        if iotests.qemu_default_machine == 'pc':

            self.vm.add_drive(None, 'media=cdrom', 'ide')

        self.vm.launch()



    def tearDown(self):
@@ -107,7 +109,7 @@ class TestSingleDrive(iotests.QMPTestCase): 
        if iotests.qemu_default_machine != 'pc':

            return



        result = self.vm.qmp('drive-backup', device='ide1-cd0',

        result = self.vm.qmp('drive-backup', device='drive2', # CD-ROM

                             target=target_img, sync='full')

        self.assert_qmp(result, 'error/class', 'GenericError')
@@ -115,7 +117,7 @@ class TestSingleDrive(iotests.QMPTestCase): 
        if iotests.qemu_default_machine != 'pc':

            return



        result = self.vm.qmp('blockdev-backup', device='ide1-cd0',

        result = self.vm.qmp('blockdev-backup', device='drive2', # CD-ROM

                             target='drive1', sync='full')

        self.assert_qmp(result, 'error/class', 'GenericError')
@@ -255,6 +257,8 @@ class TestSingleTransaction(iotests.QMPTestCase): 
        qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img, str(TestSingleDrive.image_len))



        self.vm = iotests.VM().add_drive(test_img).add_drive(blockdev_target_img)

        if iotests.qemu_default_machine == 'pc':

            self.vm.add_drive(None, 'media=cdrom', 'ide')

        self.vm.launch()



    def tearDown(self):
@@ -334,7 +338,7 @@ class TestSingleTransaction(iotests.QMPTestCase): 


        result = self.vm.qmp('transaction', actions=[{

                'type': cmd,

                'data': { 'device': 'ide1-cd0',

                'data': { 'device': 'drive2', # CD-ROM

                          'target': target,

                          'sync': 'full' },

            }