diff options
| author | Max Reitz <mreitz@redhat.com> | 2019-09-02 21:33:19 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2019-10-01 16:58:28 -0500 |
| commit | 491bf156718ca25a5c3c2f9d91c216d400e532b9 (patch) | |
| tree | 280780d7e2b9eef28dc9e0d5e6083a774a8fc05a | |
| parent | f949655dd33a78457debd1b8f2064c49e230bf10 (diff) | |
| download | qemu-491bf156718ca25a5c3c2f9d91c216d400e532b9.zip qemu-491bf156718ca25a5c3c2f9d91c216d400e532b9.tar.gz qemu-491bf156718ca25a5c3c2f9d91c216d400e532b9.tar.bz2 | |
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>
(cherry picked from commit 7c932a1d69a6d6ac5c0b615c11d191da3bbe9aa8)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rwxr-xr-x | tests/qemu-iotests/147 | 5 | ||||
| -rwxr-xr-x | tests/qemu-iotests/205 | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147 index 8251327..ce1f5b4 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 31b2f57..1cf2215 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']) |