On Fri, 2019-09-06 at 15:14 +0100, Daniel P. Berrangé wrote: > On Fri, Aug 30, 2019 at 11:56:08PM +0300, Maxim Levitsky wrote: > > Note that currently I add tests 300-302, which are > > placeholders to ease the rebase. In final version > > of these patches I will update these. > > > > Signed-off-by: Maxim Levitsky <mlevi...@redhat.com> > > --- > > tests/qemu-iotests/087.out | 6 +- > > tests/qemu-iotests/134.out | 2 +- > > tests/qemu-iotests/158.out | 4 +- > > tests/qemu-iotests/188.out | 2 +- > > tests/qemu-iotests/189.out | 4 +- > > tests/qemu-iotests/198.out | 4 +- > > tests/qemu-iotests/300 | 202 +++++++++++++++++++++++++ > > tests/qemu-iotests/300.out | 98 ++++++++++++ > > tests/qemu-iotests/301 | 90 +++++++++++ > > tests/qemu-iotests/301.out | 30 ++++ > > tests/qemu-iotests/302 | 247 +++++++++++++++++++++++++++++++ > > tests/qemu-iotests/302.out | 18 +++ > > tests/qemu-iotests/common.filter | 6 +- > > tests/qemu-iotests/group | 8 + > > 14 files changed, 708 insertions(+), 13 deletions(-) > > create mode 100755 tests/qemu-iotests/300 > > create mode 100644 tests/qemu-iotests/300.out > > create mode 100755 tests/qemu-iotests/301 > > create mode 100644 tests/qemu-iotests/301.out > > create mode 100644 tests/qemu-iotests/302 > > create mode 100644 tests/qemu-iotests/302.out > > > > diff --git a/tests/qemu-iotests/087.out b/tests/qemu-iotests/087.out > > index 2d92ea847b..b61ba638af 100644 > > --- a/tests/qemu-iotests/087.out > > +++ b/tests/qemu-iotests/087.out > > @@ -34,7 +34,7 @@ QMP_VERSION > > > > === Encrypted image QCow === > > > > -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on > > encrypt.key-secret=sec0 > > +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on > > Why is the output format changing ? There's no code changes in > this patch. If the change is due to an earlier patch, then this > patch chunk should be put in the earlier patch that causes it. > > Likewise for the changed output to other files in this patch. > > >
I tweaked the common.filter to filter more luks specific create options so that a test could have same output for both qcow2 and plain raw luks encryption. (due to the "encrypt.*" prefix) I can move this in a separate patch if you think this is worth it. Best regards, Maxim Levitsky