aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2016-06-23 14:20:24 +0200
committerKevin Wolf <kwolf@redhat.com>2016-09-05 19:06:47 +0200
commitb7e4fa224200ec87b9599a1d72b16ada35a3d113 (patch)
tree787058798837cba9032f3d18d0f5442b3c5bb74e /tests/qemu-iotests
parent7b5dca3f0215ec6484473631928a36c3eb8da0ef (diff)
block: Accept node-name for drive-backup
In order to remove the necessity to use BlockBackend names in the external API, we want to allow node-names everywhere. This converts drive-backup and the corresponding transaction action to accept a node-name without lifting the restriction that we're operating at a root node. In case of an invalid device name, the command returns the GenericError error class now instead of DeviceNotFound, because this is what qmp_get_root_bs() returns. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
-rwxr-xr-xtests/qemu-iotests/0557
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055
index c8e3578702..8113c61ade 100755
--- a/tests/qemu-iotests/055
+++ b/tests/qemu-iotests/055
@@ -134,10 +134,7 @@ class TestSingleDrive(iotests.QMPTestCase):
def do_test_device_not_found(self, cmd, **args):
result = self.vm.qmp(cmd, **args)
- if cmd == 'drive-backup':
- self.assert_qmp(result, 'error/class', 'DeviceNotFound')
- else:
- self.assert_qmp(result, 'error/class', 'GenericError')
+ self.assert_qmp(result, 'error/class', 'GenericError')
def test_device_not_found(self):
self.do_test_device_not_found('drive-backup', device='nonexistent',
@@ -371,7 +368,7 @@ class TestSingleTransaction(iotests.QMPTestCase):
'sync': 'full' },
}
])
- self.assert_qmp(result, 'error/class', 'DeviceNotFound')
+ self.assert_qmp(result, 'error/class', 'GenericError')
result = self.vm.qmp('transaction', actions=[{
'type': 'blockdev-backup',