On 27.07.20 19:45, Andrey Shinkevich wrote:
> On 25.06.2020 18:22, Max Reitz wrote:
>> This patch adds some tests on how commit copes with filter nodes.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>>   tests/qemu-iotests/040     | 177 +++++++++++++++++++++++++++++++++++++
>>   tests/qemu-iotests/040.out |   4 +-
>>   2 files changed, 179 insertions(+), 2 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040
>> index 32c82b4ec6..e7fa244738 100755
>> --- a/tests/qemu-iotests/040
>> +++ b/tests/qemu-iotests/040
>> @@ -713,6 +713,183 @@ class TestErrorHandling(iotests.QMPTestCase):
>>           self.assertTrue(iotests.compare_images(mid_img, backing_img,
>> fmt2='raw'),
>>                           'target image does not match source after
>> commit')
>>   +class TestCommitWithFilters(iotests.QMPTestCase):
>> +    img0 = os.path.join(iotests.test_dir, '0.img')
>> +    img1 = os.path.join(iotests.test_dir, '1.img')
>> +    img2 = os.path.join(iotests.test_dir, '2.img')
>> +    img3 = os.path.join(iotests.test_dir, '3.img')
>> +
>> +    def do_test_io(self, read_or_write):
> 
> 
> The method defenition could be moved down after the ones of setUp() and
> tearDown().

Yes, but it’s used by setUp(), so I thought maybe it’s nicer to place it
first.

>> +        for index, pattern_file in enumerate(self.pattern_files):
>> +            result = qemu_io('-f', iotests.imgfmt,
>> +                             '-c', '{} -P {} {}M
>> 1M'.format(read_or_write,
>> +                                                            index +
>> 1, index),
> 
> 
> The Python3 format string f'{rad_or_write} ..' might be used instead of
> the .format one.

Ah, sure.  The test is a bit older already, from when we didn’t yet use
format strings as often in the iotests. :)

>> +                             pattern_file)
>> +            self.assertFalse('Pattern verification failed' in result)
>> +
>> +    def setUp(self):
> 
> ...
> 
> 
> Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
> 
>