| Message ID | 1379990974-3348-1-git-send-email-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Sep 24, 2013 at 10:49:33AM +0800, Fam Zheng wrote: > Since commit "block: Error parameter for open functions", error output > is more verbose. Update test case output file to follow the change. This doesn't explain the "Formatting ..." trailing space change. If this has changed, please split the change into a separate patch, with an explanation of when the space was introduced, and fix the other test case output files: $ git grep '^Formatting' | grep '[^ ]$' 017.out:Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944 018.out:Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944 048.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 059.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 059.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 059.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 063.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304 063.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
On Tue, 09/24 14:49, Stefan Hajnoczi wrote: > On Tue, Sep 24, 2013 at 10:49:33AM +0800, Fam Zheng wrote: > > Since commit "block: Error parameter for open functions", error output > > is more verbose. Update test case output file to follow the change. > > This doesn't explain the "Formatting ..." trailing space change. > > If this has changed, please split the change into a separate patch, with > an explanation of when the space was introduced, and fix the other test > case output files: > > $ git grep '^Formatting' | grep '[^ ]$' > 017.out:Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944 > 018.out:Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944 > 048.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 > 059.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 > 059.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 > 059.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 > 063.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304 > 063.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152 Not sure how it's introduced, it is actually ignored when comparing because we have "-w" for diff command. I'll drop the spaces here and send another revision, I'd like focus this series for fixing vmdk and leave the space clean up for another series (if necessary). Fam
On Wed, Sep 25, 2013 at 08:58:10AM +0800, Fam Zheng wrote: > On Tue, 09/24 14:49, Stefan Hajnoczi wrote: > > On Tue, Sep 24, 2013 at 10:49:33AM +0800, Fam Zheng wrote: > > > Since commit "block: Error parameter for open functions", error output > > > is more verbose. Update test case output file to follow the change. > > > > This doesn't explain the "Formatting ..." trailing space change. > > > > If this has changed, please split the change into a separate patch, with > > an explanation of when the space was introduced, and fix the other test > > case output files: > > > > $ git grep '^Formatting' | grep '[^ ]$' > > 017.out:Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944 > > 018.out:Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944 > > 048.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 > > 059.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 > > 059.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 > > 059.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 > > 063.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304 > > 063.out:Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152 > > Not sure how it's introduced, it is actually ignored when comparing because we > have "-w" for diff command. I'll drop the spaces here and send another > revision, I'd like focus this series for fixing vmdk and leave the space clean > up for another series (if necessary). Good idea. Given the diff -w option I don't see a need to change the whitespace. Stefan
diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index 9e715e5..c64cd56 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -1,20 +1,20 @@ QA output created by 059 === Testing invalid granularity === -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 invalid granularity, image may be corrupt -qemu-io: can't open device TEST_DIR/t.vmdk +qemu-io: can't open device TEST_DIR/t.vmdk: Could not open 'TEST_DIR/t.vmdk': Wrong medium type no file open, try 'help open' === Testing too big L2 table size === -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 L2 table size too big -qemu-io: can't open device TEST_DIR/t.vmdk +qemu-io: can't open device TEST_DIR/t.vmdk: Could not open 'TEST_DIR/t.vmdk': Wrong medium type no file open, try 'help open' === Testing too big L1 table size === -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 L1 size too big -qemu-io: can't open device TEST_DIR/t.vmdk +qemu-io: can't open device TEST_DIR/t.vmdk: Could not open 'TEST_DIR/t.vmdk': Wrong medium type no file open, try 'help open' *** done
Since commit "block: Error parameter for open functions", error output is more verbose. Update test case output file to follow the change. Signed-off-by: Fam Zheng <famz@redhat.com> --- tests/qemu-iotests/059.out | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)