qemu-iotests: change _supported_proto to file for various tests

all these tests do anything of the following and thus fail with any protocol other than file: - the tests use rm, cp or mv shell commands which only work on file - the tests use qcow2.py - the images construct new filenames (e.g. backing file names) and the logic is broken for anything else than file Signed-off-by: Peter Lieven <pl@kamp.de> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
12 years ago · 1f7bf7d068
25 changed files with 25 additions and 25 deletions
--- a/tests/qemu-iotests/013
+++ b/tests/qemu-iotests/013
@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 # much of this could be generic for any format supporting compression.
 _supported_fmt qcow qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 TEST_OFFSETS="0 4294967296"
--- a/tests/qemu-iotests/014
+++ b/tests/qemu-iotests/014
@ -43,7 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 # much of this could be generic for any format supporting snapshots
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 TEST_OFFSETS="0 4294967296"
--- a/tests/qemu-iotests/018
+++ b/tests/qemu-iotests/018
@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 # Any format supporting backing files
 _supported_fmt qcow qcow2 vmdk qed
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"

--- a/tests/qemu-iotests/019
+++ b/tests/qemu-iotests/019
@ -45,7 +45,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 # Any format supporting backing files
 _supported_fmt qcow qcow2 vmdk qed
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                     "subformat=twoGbMaxExtentFlat" \
--- a/tests/qemu-iotests/023
+++ b/tests/qemu-iotests/023
@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 # much of this could be generic for any format supporting compression.
 _supported_fmt qcow qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 TEST_OFFSETS="0 4294967296"
--- a/tests/qemu-iotests/024
+++ b/tests/qemu-iotests/024
@ -43,7 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 # Currently only qcow2 and qed support rebasing
 _supported_fmt qcow2 qed
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 CLUSTER_SIZE=65536
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026
@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 # Currently only qcow2 supports rebasing
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _default_cache_mode "writethrough"
 _supported_cache_modes "writethrough" "none"
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028
@ -45,7 +45,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files except vmdk and qcow which do not support
 # smaller backing files.
 _supported_fmt qcow2 qed
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 # Choose a size that is not necessarily a cluster size multiple for image
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031
@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 CLUSTER_SIZE=65536
--- a/tests/qemu-iotests/034
+++ b/tests/qemu-iotests/034
@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter

 _supported_fmt qcow qcow2 vmdk qed
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                     "subformat=twoGbMaxExtentFlat" \
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 # Only qcow2v3 and later supports feature bits
--- a/tests/qemu-iotests/037
+++ b/tests/qemu-iotests/037
@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter

 _supported_fmt qcow qcow2 vmdk qed
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                     "subformat=twoGbMaxExtentFlat" \
--- a/tests/qemu-iotests/038
+++ b/tests/qemu-iotests/038
@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter

 _supported_fmt qcow2 qed
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 CLUSTER_SIZE=2M
--- a/tests/qemu-iotests/039
+++ b/tests/qemu-iotests/039
@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter

 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _default_cache_mode "writethrough"
 _supported_cache_modes "writethrough"
--- a/tests/qemu-iotests/043
+++ b/tests/qemu-iotests/043
@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 # Any format supporting backing files
 _supported_fmt qcow2 qed
-_supported_proto generic
+_supported_proto file
 _supported_os Linux


--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter

 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 CLUSTER_SIZE=64k
--- a/tests/qemu-iotests/052
+++ b/tests/qemu-iotests/052
@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter

 _supported_fmt generic
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _default_cache_mode "writethrough"
 _supported_cache_modes "writethrough"
--- a/tests/qemu-iotests/054
+++ b/tests/qemu-iotests/054
@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter

 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 echo
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 # This tests vmdk-specific low-level functionality
 _supported_fmt vmdk
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                     "subformat=twoGbMaxExtentFlat" \
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 rt_offset=65536  # 0x10000 (XXX: just an assumption)
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15

 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 echo
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.pattern

 _supported_fmt qcow qcow2 vmdk qed raw
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                     "subformat=twoGbMaxExtentFlat" \
--- a/tests/qemu-iotests/069
+++ b/tests/qemu-iotests/069
@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter

 _supported_fmt cow qed qcow qcow2 vmdk
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"

--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter

 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 function do_run_qemu()
--- a/tests/qemu-iotests/072
+++ b/tests/qemu-iotests/072
@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter

 _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow cow
-_supported_proto generic
+_supported_proto file
 _supported_os Linux

 IMG_SIZE=64M