Signed-off-by: Max Reitz <mre...@redhat.com>
---
tests/qemu-iotests/147 | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147
index ab8480b9a4..920e44a65c 100755
--- a/tests/qemu-iotests/147
+++ b/tests/qemu-iotests/147
@@ -24,7 +24,8 @@ import socket
import stat
import time
import iotests
-from iotests import cachemode, imgfmt, qemu_img, qemu_nbd, qemu_nbd_early_pipe
+from iotests import cachemode, imgfmt, create_test_image, remove_test_image, \
+ qemu_nbd, qemu_nbd_early_pipe
NBD_PORT_START = 32768
NBD_PORT_END = NBD_PORT_START + 1024
@@ -80,13 +81,13 @@ class NBDBlockdevAddBase(iotests.QMPTestCase):
class QemuNBD(NBDBlockdevAddBase):
def setUp(self):
- qemu_img('create', '-f', iotests.imgfmt, test_img, '64k')
+ create_test_image(test_img, '64k')
self.vm = iotests.VM()
self.vm.launch()
def tearDown(self):
self.vm.shutdown()
- os.remove(test_img)
+ remove_test_image(test_img)
try:
os.remove(unix_socket)
except OSError:
@@ -127,7 +128,7 @@ class QemuNBD(NBDBlockdevAddBase):
class BuiltinNBD(NBDBlockdevAddBase):
def setUp(self):
- qemu_img('create', '-f', iotests.imgfmt, test_img, '64k')
+ create_test_image(test_img, '64k')
self.vm = iotests.VM()
self.vm.launch()
self.server = iotests.VM('.server')
@@ -140,7 +141,7 @@ class BuiltinNBD(NBDBlockdevAddBase):
def tearDown(self):
self.vm.shutdown()
self.server.shutdown()
- os.remove(test_img)
+ remove_test_image(test_img)
try:
os.remove(unix_socket)
except OSError:
--
2.21.0
