[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 07/58] iotests: 030: Prepare for image locking
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 07/58] iotests: 030: Prepare for image locking |
Date: |
Thu, 11 May 2017 16:32:10 +0200 |
From: Fam Zheng <address@hidden>
qemu-img and qemu-io commands when guest is running need "-U" option,
add it.
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/030 | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index 0d472d5..e00c11b 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -63,8 +63,8 @@ class TestSingleDrive(iotests.QMPTestCase):
def test_stream_intermediate(self):
self.assert_no_active_block_jobs()
- self.assertNotEqual(qemu_io('-f', 'raw', '-c', 'map', backing_img),
- qemu_io('-f', iotests.imgfmt, '-c', 'map',
mid_img),
+ self.assertNotEqual(qemu_io('-f', 'raw', '-rU', '-c', 'map',
backing_img),
+ qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map',
mid_img),
'image file map matches backing file before
streaming')
result = self.vm.qmp('block-stream', device='mid', job_id='stream-mid')
@@ -114,7 +114,7 @@ class TestSingleDrive(iotests.QMPTestCase):
self.assert_no_active_block_jobs()
# The image map is empty before the operation
- empty_map = qemu_io('-f', iotests.imgfmt, '-c', 'map', test_img)
+ empty_map = qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map', test_img)
# This is a no-op: no data should ever be copied from the base image
result = self.vm.qmp('block-stream', device='drive0', base=mid_img)
@@ -197,8 +197,8 @@ class TestParallelOps(iotests.QMPTestCase):
# Check that the maps don't match before the streaming operations
for i in range(2, self.num_imgs, 2):
- self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map',
self.imgs[i]),
- qemu_io('-f', iotests.imgfmt, '-c', 'map',
self.imgs[i-1]),
+ self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-rU', '-c',
'map', self.imgs[i]),
+ qemu_io('-f', iotests.imgfmt, '-rU', '-c',
'map', self.imgs[i-1]),
'image file map matches backing file before
streaming')
# Create all streaming jobs
@@ -351,8 +351,8 @@ class TestParallelOps(iotests.QMPTestCase):
def test_stream_base_node_name(self):
self.assert_no_active_block_jobs()
- self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map',
self.imgs[4]),
- qemu_io('-f', iotests.imgfmt, '-c', 'map',
self.imgs[3]),
+ self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map',
self.imgs[4]),
+ qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map',
self.imgs[3]),
'image file map matches backing file before
streaming')
# Error: the base node does not exist
@@ -422,8 +422,8 @@ class TestQuorum(iotests.QMPTestCase):
if not iotests.supports_quorum():
return
- self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map',
self.children[0]),
- qemu_io('-f', iotests.imgfmt, '-c', 'map',
self.backing[0]),
+ self.assertNotEqual(qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map',
self.children[0]),
+ qemu_io('-f', iotests.imgfmt, '-rU', '-c', 'map',
self.backing[0]),
'image file map matches backing file before
streaming')
self.assert_no_active_block_jobs()
--
1.8.3.1
- [Qemu-block] [PULL 01/58] block: Make bdrv_perm_names public, (continued)
- [Qemu-block] [PULL 01/58] block: Make bdrv_perm_names public, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 03/58] block: Respect "force-share" in perm propagating, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 02/58] block: Add, parse and store "force-share" option, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 06/58] qemu-io: Add --force-share option, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 04/58] qemu-img: Add --force-share option to subcommands, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 09/58] iotests: 055: Don't attach the target image already for drive-backup, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 05/58] qemu-img: Update documentation for -U, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 08/58] iotests: 046: Prepare for image locking, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 07/58] iotests: 030: Prepare for image locking,
Kevin Wolf <=
- [Qemu-block] [PULL 10/58] iotests: 085: Avoid image locking conflict, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 11/58] iotests: 087: Don't attach test image twice, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 12/58] iotests: 091: Quit QEMU before checking image, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 13/58] iotests: 172: Use separate images for multiple devices, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 17/58] tests: Disable image lock in test-replication, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 16/58] file-win32: Error out if locking=on, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 14/58] tests: Use null-co:// instead of /dev/null as the dummy image, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 15/58] file-posix: Add 'locking' option, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 18/58] block: Reuse bs as backing hd for drive-backup sync=none, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 19/58] osdep: Add qemu_lock_fd and qemu_unlock_fd, Kevin Wolf, 2017/05/11