Re: [Qemu-block] [PATCH v3 6/8] iotests: Test driver whitelisting in 093

[Max Reitz]

On 20.08.19 08:40, Thomas Huth wrote:
> On 8/19/19 10:18 PM, 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/093 | 12 +++++++++---
>>  1 file changed, 9 insertions(+), 3 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/093 b/tests/qemu-iotests/093
>> index 50c1e7f2ec..f03fa24a07 100755
>> --- a/tests/qemu-iotests/093
>> +++ b/tests/qemu-iotests/093
>> @@ -24,7 +24,7 @@ import iotests
>>  nsec_per_sec = 1000000000
>>  
>>  class ThrottleTestCase(iotests.QMPTestCase):
>> -    test_img = "null-aio://"
>> +    test_driver = "null-aio"
>>      max_drives = 3
>>  
>>      def blockstats(self, device):
>> @@ -35,10 +35,14 @@ class ThrottleTestCase(iotests.QMPTestCase):
>>                  return stat['rd_bytes'], stat['rd_operations'], 
>> stat['wr_bytes'], stat['wr_operations']
>>          raise Exception("Device not found for blockstats: %s" % device)
>>  
>> +    def required_drivers(self):
>> +        return [self.test_driver]
>> +
>> +    @iotests.skip_if_unsupported(required_drivers)
>>      def setUp(self):
>>          self.vm = iotests.VM()
>>          for i in range(0, self.max_drives):
>> -            self.vm.add_drive(self.test_img, "file.read-zeroes=on")
>> +            self.vm.add_drive(self.test_driver + "://", 
>> "file.read-zeroes=on")
>>          self.vm.launch()
>>  
>>      def tearDown(self):
>> @@ -264,7 +268,7 @@ class ThrottleTestCase(iotests.QMPTestCase):
>>          self.assertEqual(self.blockstats('drive1')[0], 4096)
>>  
>>  class ThrottleTestCoroutine(ThrottleTestCase):
>> -    test_img = "null-co://"
>> +    test_driver = "null-co"
>>  
>>  class ThrottleTestGroupNames(iotests.QMPTestCase):
>>      max_drives = 3
>> @@ -425,4 +429,6 @@ class ThrottleTestRemovableMedia(iotests.QMPTestCase):
>>  
>>  
>>  if __name__ == '__main__':
>> +    if 'null-co' not in iotests.supported_formats():
>> +        iotests.notrun('null-co driver support missing')
>>      iotests.main(supported_fmts=["raw"])
> 
> Maybe also mention null-co in the patch description?

I probably didn’t because I felt bad that maybe I should add a null-co
check to all tests that require it...  But two wrongs don’t make a
right, so I’ll leave it at one wrong and put “Skip the whole test if
null-co is not whitelisted.” into the commit message, yes.

Max

signature.asc
Description: OpenPGP digital signature