diff options
| author | Jeff Cody <jcody@redhat.com> | 2012-10-16 15:49:10 -0400 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-10-24 10:26:19 +0200 |
| commit | d5208c45be38ab858db6ec5a5097aa1c1a8ebbc9 (patch) | |
| tree | ce7f91f0ae21e2151d9c5620e03378c535523dd7 /tests | |
| parent | b1b1d783eabdb6ac4e4578b2c04b0c24483dce77 (diff) | |
| download | qemu-d5208c45be38ab858db6ec5a5097aa1c1a8ebbc9.zip qemu-d5208c45be38ab858db6ec5a5097aa1c1a8ebbc9.tar.gz qemu-d5208c45be38ab858db6ec5a5097aa1c1a8ebbc9.tar.bz2 | |
block: in commit, determine base image from the top image
This simplifies some code and error checking, and also fixes a bug.
bdrv_find_backing_image() should only be passed absolute filenames,
or filenames relative to the chain. In the QMP message handler for
block commit, when looking up the base do so from the determined top
image, so we know it is reachable from top.
Some of the error messages put out by block-commit have changed
slightly, which causes 2 tests cases for block-commit to fail.
This patch updates the test cases to look for the correct error
output.
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/040 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index 258e7ea..0fa6441 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -111,7 +111,7 @@ class TestSingleDrive(ImageCommitTestCase): self.assert_no_active_commit() result = self.vm.qmp('block-commit', device='drive0', top='%s' % backing_img, base='%s' % backing_img) self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Invalid files for merge: top and base are the same') + self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % backing_img) def test_top_invalid(self): self.assert_no_active_commit() @@ -135,7 +135,7 @@ class TestSingleDrive(ImageCommitTestCase): self.assert_no_active_commit() result = self.vm.qmp('block-commit', device='drive0', top='%s' % backing_img, base='%s' % mid_img) self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Base (%(1)s) is not reachable from top (%(2)s)' % {"1" : mid_img, "2" : backing_img}) + self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % mid_img) def test_top_omitted(self): self.assert_no_active_commit() |