Message ID | 1413805631-11626-1-git-send-email-pl@kamp.de |
---|---|
State | New |
Headers | show |
The Monday 20 Oct 2014 à 13:47:11 (+0200), Peter Lieven wrote : > In preparation to possible automatic regression and performance > testing for the block layer I found that the iotests don't work > for all protocols anymore. > > In commit 1f7bf7d0 I started to change supported protocols from > generic to file for various tests. Unfortunately, some tests > added in the meantime again carry generic protocol altough they > can only work with file because they require local file access. > > The other way around for some tests that only support file I added > NFS protocol after confirming they work. > > Signed-off-by: Peter Lieven <pl@kamp.de> > --- > tests/qemu-iotests/075 | 2 +- > tests/qemu-iotests/076 | 2 +- > tests/qemu-iotests/078 | 2 +- > tests/qemu-iotests/079 | 2 +- > tests/qemu-iotests/080 | 2 +- > tests/qemu-iotests/081 | 2 +- > tests/qemu-iotests/082 | 2 +- > tests/qemu-iotests/084 | 2 +- > tests/qemu-iotests/086 | 2 +- > tests/qemu-iotests/088 | 2 +- > tests/qemu-iotests/090 | 2 +- > tests/qemu-iotests/092 | 2 +- > tests/qemu-iotests/103 | 2 +- > 13 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075 > index 40032c5..6117660 100755 > --- a/tests/qemu-iotests/075 > +++ b/tests/qemu-iotests/075 > @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.filter > > _supported_fmt cloop > -_supported_proto generic > +_supported_proto file > _supported_os Linux > > block_size_offset=128 > diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076 > index b614a7d..bc47457 100755 > --- a/tests/qemu-iotests/076 > +++ b/tests/qemu-iotests/076 > @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.filter > > _supported_fmt parallels > -_supported_proto generic > +_supported_proto file > _supported_os Linux > > tracks_offset=$((0x1c)) > diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078 > index d4d6da7..7be2c3f 100755 > --- a/tests/qemu-iotests/078 > +++ b/tests/qemu-iotests/078 > @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.filter > > _supported_fmt bochs > -_supported_proto generic > +_supported_proto file > _supported_os Linux > > catalog_size_offset=$((0x48)) > diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 > index 2142bbb..6613cfb 100755 > --- a/tests/qemu-iotests/079 > +++ b/tests/qemu-iotests/079 > @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.filter > > _supported_fmt qcow2 > -_supported_proto file > +_supported_proto file nfs > _supported_os Linux > > function test_qemu_img() > diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 > index 6b3a3e7..9de337c 100755 > --- a/tests/qemu-iotests/080 > +++ b/tests/qemu-iotests/080 > @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.filter > > _supported_fmt qcow2 > -_supported_proto generic > +_supported_proto file > _supported_os Linux > > header_size=104 > diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 > index 7ae4be2..ed3c29e 100755 > --- a/tests/qemu-iotests/081 > +++ b/tests/qemu-iotests/081 > @@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.filter > > _supported_fmt raw > -_supported_proto generic > +_supported_proto file > _supported_os Linux > > function do_run_qemu() > diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 > index 910b13e..e64de27 100755 > --- a/tests/qemu-iotests/082 > +++ b/tests/qemu-iotests/082 > @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.filter > > _supported_fmt qcow2 > -_supported_proto file > +_supported_proto file nfs > _supported_os Linux > > function run_qemu_img() > diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084 > index ae33c2c..2712c02 100755 > --- a/tests/qemu-iotests/084 > +++ b/tests/qemu-iotests/084 > @@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > > # This tests vdi-specific header fields > _supported_fmt vdi > -_supported_proto generic > +_supported_proto file > _supported_os Linux > > size=64M > diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086 > index d9a80cf..234eb9a 100755 > --- a/tests/qemu-iotests/086 > +++ b/tests/qemu-iotests/086 > @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.filter > > _supported_fmt qcow2 > -_supported_proto file > +_supported_proto file nfs > _supported_os Linux > > function run_qemu_img() > diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088 > index c09adf8..f9c3129 100755 > --- a/tests/qemu-iotests/088 > +++ b/tests/qemu-iotests/088 > @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.filter > > _supported_fmt vpc > -_supported_proto generic > +_supported_proto file > _supported_os Linux > > offset_block_size=$((512 + 32)) > diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090 > index 8d032f8..70b5a6f 100755 > --- a/tests/qemu-iotests/090 > +++ b/tests/qemu-iotests/090 > @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.filter > > _supported_fmt qcow2 > -_supported_proto file > +_supported_proto file nfs > _supported_os Linux > > IMG_SIZE=128K > diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092 > index a8c0c9c..52c529b 100755 > --- a/tests/qemu-iotests/092 > +++ b/tests/qemu-iotests/092 > @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.filter > > _supported_fmt qcow > -_supported_proto generic > +_supported_proto file > _supported_os Linux > > offset_backing_file_offset=8 > diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 > index 0f1dc9f..ccab551 100755 > --- a/tests/qemu-iotests/103 > +++ b/tests/qemu-iotests/103 > @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 > . ./common.filter > > _supported_fmt qcow2 > -_supported_proto file > +_supported_proto file nfs > _supported_os Linux > > IMG_SIZE=64K > -- > 1.7.9.5 > > Seems legit. Reviewed-by: Benoît Canet <benoit.canet@nodalink.com>
Am 20.10.2014 um 13:47 hat Peter Lieven geschrieben: > In preparation to possible automatic regression and performance > testing for the block layer I found that the iotests don't work > for all protocols anymore. > > In commit 1f7bf7d0 I started to change supported protocols from > generic to file for various tests. Unfortunately, some tests > added in the meantime again carry generic protocol altough they > can only work with file because they require local file access. > > The other way around for some tests that only support file I added > NFS protocol after confirming they work. > > Signed-off-by: Peter Lieven <pl@kamp.de> Thanks, applied to the block branch. I suspect the test cases where you added nfs are actually generic. Did you check this? Kevin
Am 22.10.2014 um 14:03 schrieb Kevin Wolf: > Am 20.10.2014 um 13:47 hat Peter Lieven geschrieben: >> In preparation to possible automatic regression and performance >> testing for the block layer I found that the iotests don't work >> for all protocols anymore. >> >> In commit 1f7bf7d0 I started to change supported protocols from >> generic to file for various tests. Unfortunately, some tests >> added in the meantime again carry generic protocol altough they >> can only work with file because they require local file access. >> >> The other way around for some tests that only support file I added >> NFS protocol after confirming they work. >> >> Signed-off-by: Peter Lieven <pl@kamp.de> > Thanks, applied to the block branch. > > I suspect the test cases where you added nfs are actually generic. Did > you check this? likely yes, but I didn't test, as I currently have no resources to check special protocols that require additional setup like gluster, sheepdog etc. Peter
Am 22.10.2014 um 14:03 schrieb Kevin Wolf: > Am 20.10.2014 um 13:47 hat Peter Lieven geschrieben: >> In preparation to possible automatic regression and performance >> testing for the block layer I found that the iotests don't work >> for all protocols anymore. >> >> In commit 1f7bf7d0 I started to change supported protocols from >> generic to file for various tests. Unfortunately, some tests >> added in the meantime again carry generic protocol altough they >> can only work with file because they require local file access. >> >> The other way around for some tests that only support file I added >> NFS protocol after confirming they work. >> >> Signed-off-by: Peter Lieven <pl@kamp.de> > Thanks, applied to the block branch. > > I suspect the test cases where you added nfs are actually generic. Did > you check this? Thinking about this again. Generic is probably wrong because not all protocols support bdrv_create. Peter
diff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075 index 40032c5..6117660 100755 --- a/tests/qemu-iotests/075 +++ b/tests/qemu-iotests/075 @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt cloop -_supported_proto generic +_supported_proto file _supported_os Linux block_size_offset=128 diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076 index b614a7d..bc47457 100755 --- a/tests/qemu-iotests/076 +++ b/tests/qemu-iotests/076 @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt parallels -_supported_proto generic +_supported_proto file _supported_os Linux tracks_offset=$((0x1c)) diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078 index d4d6da7..7be2c3f 100755 --- a/tests/qemu-iotests/078 +++ b/tests/qemu-iotests/078 @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt bochs -_supported_proto generic +_supported_proto file _supported_os Linux catalog_size_offset=$((0x48)) diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 index 2142bbb..6613cfb 100755 --- a/tests/qemu-iotests/079 +++ b/tests/qemu-iotests/079 @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt qcow2 -_supported_proto file +_supported_proto file nfs _supported_os Linux function test_qemu_img() diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 index 6b3a3e7..9de337c 100755 --- a/tests/qemu-iotests/080 +++ b/tests/qemu-iotests/080 @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt qcow2 -_supported_proto generic +_supported_proto file _supported_os Linux header_size=104 diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 index 7ae4be2..ed3c29e 100755 --- a/tests/qemu-iotests/081 +++ b/tests/qemu-iotests/081 @@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt raw -_supported_proto generic +_supported_proto file _supported_os Linux function do_run_qemu() diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 index 910b13e..e64de27 100755 --- a/tests/qemu-iotests/082 +++ b/tests/qemu-iotests/082 @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt qcow2 -_supported_proto file +_supported_proto file nfs _supported_os Linux function run_qemu_img() diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084 index ae33c2c..2712c02 100755 --- a/tests/qemu-iotests/084 +++ b/tests/qemu-iotests/084 @@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # This tests vdi-specific header fields _supported_fmt vdi -_supported_proto generic +_supported_proto file _supported_os Linux size=64M diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086 index d9a80cf..234eb9a 100755 --- a/tests/qemu-iotests/086 +++ b/tests/qemu-iotests/086 @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt qcow2 -_supported_proto file +_supported_proto file nfs _supported_os Linux function run_qemu_img() diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088 index c09adf8..f9c3129 100755 --- a/tests/qemu-iotests/088 +++ b/tests/qemu-iotests/088 @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt vpc -_supported_proto generic +_supported_proto file _supported_os Linux offset_block_size=$((512 + 32)) diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090 index 8d032f8..70b5a6f 100755 --- a/tests/qemu-iotests/090 +++ b/tests/qemu-iotests/090 @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt qcow2 -_supported_proto file +_supported_proto file nfs _supported_os Linux IMG_SIZE=128K diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092 index a8c0c9c..52c529b 100755 --- a/tests/qemu-iotests/092 +++ b/tests/qemu-iotests/092 @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt qcow -_supported_proto generic +_supported_proto file _supported_os Linux offset_backing_file_offset=8 diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 index 0f1dc9f..ccab551 100755 --- a/tests/qemu-iotests/103 +++ b/tests/qemu-iotests/103 @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt qcow2 -_supported_proto file +_supported_proto file nfs _supported_os Linux IMG_SIZE=64K
In preparation to possible automatic regression and performance testing for the block layer I found that the iotests don't work for all protocols anymore. In commit 1f7bf7d0 I started to change supported protocols from generic to file for various tests. Unfortunately, some tests added in the meantime again carry generic protocol altough they can only work with file because they require local file access. The other way around for some tests that only support file I added NFS protocol after confirming they work. Signed-off-by: Peter Lieven <pl@kamp.de> --- tests/qemu-iotests/075 | 2 +- tests/qemu-iotests/076 | 2 +- tests/qemu-iotests/078 | 2 +- tests/qemu-iotests/079 | 2 +- tests/qemu-iotests/080 | 2 +- tests/qemu-iotests/081 | 2 +- tests/qemu-iotests/082 | 2 +- tests/qemu-iotests/084 | 2 +- tests/qemu-iotests/086 | 2 +- tests/qemu-iotests/088 | 2 +- tests/qemu-iotests/090 | 2 +- tests/qemu-iotests/092 | 2 +- tests/qemu-iotests/103 | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-)