iotests: Fix 104 for NBD
commita231cb272611c758d45135f6a35a4dd1beaf5585
authorMax Reitz <mreitz@redhat.com>
Tue, 27 Jan 2015 02:02:58 +0000 (26 21:02 -0500)
committerKevin Wolf <kwolf@redhat.com>
Fri, 6 Feb 2015 16:24:22 +0000 (6 17:24 +0100)
tree3c63b1a04adff75968681f7aa2f3eba05e8f0aea
parent23ab6953f4675b8663888ce6cfe40f4191be3e48
iotests: Fix 104 for NBD

_make_test_img sets up an NBD server, _cleanup_test_img shuts it down;
thus, _cleanup_test_img has to be called before _make_test_img is
invoked another time.

Furthermore, the pipe through _filter_test_img was unnecessary;
_make_test_img already takes care of that.

And finally, a filter is added to _filter_img_info to replace
"nbd://127.0.0.1:10810" by "TEST_DIR/t.IMGFMT", since the former is the
way to express the full image path (normally the latter) for NBD tests.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
tests/qemu-iotests/104
tests/qemu-iotests/common.filter