From: Max Reitz Date: Mon, 2 Sep 2019 19:33:19 +0000 (+0200) Subject: iotests: Restrict nbd Python tests to nbd X-Git-Tag: v4.0.1~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=491bf156718ca25a5c3c2f9d91c216d400e532b9;p=thirdparty%2Fqemu.git 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 Signed-off-by: Kevin Wolf (cherry picked from commit 7c932a1d69a6d6ac5c0b615c11d191da3bbe9aa8) Signed-off-by: Michael Roth --- diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147 index 82513279b02..ce1f5b459d1 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 31b2f5707a5..1cf22157309 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'])