Revision d5208c45 tests/qemu-iotests/040
b/tests/qemu-iotests/040 | ||
---|---|---|
111 | 111 |
self.assert_no_active_commit() |
112 | 112 |
result = self.vm.qmp('block-commit', device='drive0', top='%s' % backing_img, base='%s' % backing_img) |
113 | 113 |
self.assert_qmp(result, 'error/class', 'GenericError') |
114 |
self.assert_qmp(result, 'error/desc', 'Invalid files for merge: top and base are the same')
|
|
114 |
self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % backing_img)
|
|
115 | 115 |
|
116 | 116 |
def test_top_invalid(self): |
117 | 117 |
self.assert_no_active_commit() |
... | ... | |
135 | 135 |
self.assert_no_active_commit() |
136 | 136 |
result = self.vm.qmp('block-commit', device='drive0', top='%s' % backing_img, base='%s' % mid_img) |
137 | 137 |
self.assert_qmp(result, 'error/class', 'GenericError') |
138 |
self.assert_qmp(result, 'error/desc', 'Base (%(1)s) is not reachable from top (%(2)s)' % {"1" : mid_img, "2" : backing_img})
|
|
138 |
self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % mid_img)
|
|
139 | 139 |
|
140 | 140 |
def test_top_omitted(self): |
141 | 141 |
self.assert_no_active_commit() |
Also available in: Unified diff