summaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/056
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2019-05-21 17:00:53 -0400
committerMax Reitz <mreitz@redhat.com>2019-05-28 20:30:55 +0200
commita2d665c1bc3624a8375e2f9a7d569f7565cc1358 (patch)
treebd46483bd78e87dce5630a6cc3831af407376897 /tests/qemu-iotests/056
parent6388903e7cc9b6528934a083e81f086322c24c86 (diff)
downloadqemu-a2d665c1bc3624a8375e2f9a7d569f7565cc1358.zip
blockdev: loosen restrictions on drive-backup source node
We mandate that the source node must be a root node; but there's no reason I am aware of that it needs to be restricted to such. In some cases, we need to make sure that there's a medium present, but in the general case we can allow the backup job itself to do the graph checking. This patch helps improve the error message when you try to backup from the same node more than once, which is reflected in the change to test 056. For backups with bitmaps, it will also show a better error message that the bitmap is in use instead of giving you something cryptic like "need a root node." Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1707303 Signed-off-by: John Snow <jsnow@redhat.com> Message-id: 20190521210053.8864-1-jsnow@redhat.com Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/056')
-rwxr-xr-xtests/qemu-iotests/0562
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/056 b/tests/qemu-iotests/056
index 3df323984d..f40fc11a09 100755
--- a/tests/qemu-iotests/056
+++ b/tests/qemu-iotests/056
@@ -214,7 +214,7 @@ class BackupTest(iotests.QMPTestCase):
res = self.vm.qmp('query-block-jobs')
self.assert_qmp(res, 'return[0]/status', 'concluded')
# Leave zombie job un-dismissed, observe a failure:
- res = self.qmp_backup_and_wait(serror='Need a root block node',
+ res = self.qmp_backup_and_wait(serror="Node 'drive0' is busy: block device is in use by block job: backup",
device='drive0', format=iotests.imgfmt,
sync='full', target=self.dest_img,
auto_dismiss=False)