summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Reitz2019-09-02 21:33:19 +0200
committerKevin Wolf2019-09-10 08:58:43 +0200
commit7c932a1d69a6d6ac5c0b615c11d191da3bbe9aa8 (patch)
tree0d5a1c39e5392c88359657387a0d96b6d025e17c
parentiotests: Restrict file Python tests to file (diff)
downloadqemu-7c932a1d69a6d6ac5c0b615c11d191da3bbe9aa8.tar.gz
qemu-7c932a1d69a6d6ac5c0b615c11d191da3bbe9aa8.tar.xz
qemu-7c932a1d69a6d6ac5c0b615c11d191da3bbe9aa8.zip
iotests: Restrict nbd Python tests to nbd
We have two Python unittest-style tests that test NBD. As such, they should specify supported_protocols=['nbd'] so they are skipped when the user wants to test some other protocol. Furthermore, we should restrict their choice of formats to 'raw'. The idea of a protocol/format combination is to use some format over some protocol; but we always use the raw format over NBD. It does not really matter what the NBD server uses on its end, and it is not a useful test of the respective format driver anyway. Signed-off-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rwxr-xr-xtests/qemu-iotests/1475
-rwxr-xr-xtests/qemu-iotests/2053
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147
index 2d84fddb01..ab8480b9a4 100755
--- a/tests/qemu-iotests/147
+++ b/tests/qemu-iotests/147
@@ -287,6 +287,5 @@ class BuiltinNBD(NBDBlockdevAddBase):
if __name__ == '__main__':
- # Need to support image creation
- iotests.main(supported_fmts=['vpc', 'parallels', 'qcow', 'vdi', 'qcow2',
- 'vmdk', 'raw', 'vhdx', 'qed'])
+ iotests.main(supported_fmts=['raw'],
+ supported_protocols=['nbd'])
diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205
index b8a86c446e..76f6c5fa2b 100755
--- a/tests/qemu-iotests/205
+++ b/tests/qemu-iotests/205
@@ -153,4 +153,5 @@ class TestNbdServerRemove(iotests.QMPTestCase):
if __name__ == '__main__':
- iotests.main(supported_fmts=['generic'])
+ iotests.main(supported_fmts=['raw'],
+ supported_protocols=['nbd'])