[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 6/7] iotests: Test driver whitelisting in 136
From: |
Andrey Shinkevich |
Subject: |
Re: [Qemu-devel] [PATCH v4 6/7] iotests: Test driver whitelisting in 136 |
Date: |
Tue, 17 Sep 2019 15:14:26 +0000 |
On 17/09/2019 12:20, Max Reitz wrote:
> null-aio may not be whitelisted. Skip all test cases that require it.
>
> Signed-off-by: Max Reitz <address@hidden>
> ---
> tests/qemu-iotests/136 | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/tests/qemu-iotests/136 b/tests/qemu-iotests/136
> index a46a7b7630..012ea111ac 100755
> --- a/tests/qemu-iotests/136
> +++ b/tests/qemu-iotests/136
> @@ -30,7 +30,7 @@ bad_offset = bad_sector * 512
> blkdebug_file = os.path.join(iotests.test_dir, 'blkdebug.conf')
>
> class BlockDeviceStatsTestCase(iotests.QMPTestCase):
> - test_img = "null-aio://"
> + test_driver = "null-aio"
> total_rd_bytes = 0
> total_rd_ops = 0
> total_wr_bytes = 0
> @@ -67,6 +67,10 @@ sector = "%d"
> ''' % (bad_sector, bad_sector))
> file.close()
>
> + def required_drivers(self):
> + return [self.test_driver]
> +
> + @iotests.skip_if_unsupported(required_drivers)
> def setUp(self):
> drive_args = []
> drive_args.append("stats-intervals.0=%d" % interval_length)
> @@ -76,8 +80,8 @@ sector = "%d"
> (self.account_failed and "on" or "off"))
> drive_args.append("file.image.read-zeroes=on")
> self.create_blkdebug_file()
> - self.vm = iotests.VM().add_drive('blkdebug:%s:%s' %
> - (blkdebug_file, self.test_img),
> + self.vm = iotests.VM().add_drive('blkdebug:%s:%s://' %
> + (blkdebug_file, self.test_driver),
> ','.join(drive_args))
> self.vm.launch()
> # Set an initial value for the clock
> @@ -337,7 +341,9 @@ class
> BlockDeviceStatsTestAccountBoth(BlockDeviceStatsTestCase):
> account_failed = True
>
> class BlockDeviceStatsTestCoroutine(BlockDeviceStatsTestCase):
> - test_img = "null-co://"
> + test_driver = "null-co"
>
> if __name__ == '__main__':
> + if 'null-co' not in iotests.supported_formats():
> + iotests.notrun('null-co driver support missing')
> iotests.main(supported_fmts=["raw"])
>
Reviewed-by: Andrey Shinkevich <address@hidden>
--
With the best regards,
Andrey Shinkevich