| Message ID | 1445280546-26226-7-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 10/19/2015 12:49 PM, Max Reitz wrote: > After drive-mirror replacing a Quorum child, the filename of the Quorum > BDS should reflect the change. This patch replaces the existing test for > whether the operation did actually exchange the BDS (which simply tested > whether the new BDS existed) by a test which examines the children list > contained in the Quorum BDS's filename as returned by query-block. > > As a nice side effect of confirming that the new BDS actually belongs to > the Quorum BDS, this checks whether the filename was properly updated. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/041 | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
Am 19.10.2015 um 20:49 hat Max Reitz geschrieben: > After drive-mirror replacing a Quorum child, the filename of the Quorum > BDS should reflect the change. This patch replaces the existing test for > whether the operation did actually exchange the BDS (which simply tested > whether the new BDS existed) by a test which examines the children list > contained in the Quorum BDS's filename as returned by query-block. > > As a nice side effect of confirming that the new BDS actually belongs to > the Quorum BDS, this checks whether the filename was properly updated. > > Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com>
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index 05b5962..6703882 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -18,6 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +import json import time import os import iotests @@ -920,10 +921,18 @@ class TestRepairQuorum(iotests.QMPTestCase): self.assert_qmp(result, 'return', {}) self.complete_and_wait(drive="quorum0") - result = self.vm.qmp('query-named-block-nodes') - self.assert_qmp(result, 'return[0]/file', quorum_repair_img) - # TODO: a better test requiring some QEMU infrastructure will be added - # to check that this file is really driven by quorum + + result = self.vm.qmp('query-block') + for blockdev in result['return']: + if blockdev['device'] == 'quorum0': + filename = blockdev['inserted']['image']['filename'] + self.assertEquals(filename[:5], 'json:') + children = json.loads(filename[5:])['children'] + self.assertEquals(children[0]['file']['filename'], quorum_img1) + self.assertEquals(children[1]['file']['filename'], + quorum_repair_img) + self.assertEquals(children[2]['file']['filename'], quorum_img3) + self.vm.shutdown() if __name__ == '__main__':
After drive-mirror replacing a Quorum child, the filename of the Quorum BDS should reflect the change. This patch replaces the existing test for whether the operation did actually exchange the BDS (which simply tested whether the new BDS existed) by a test which examines the children list contained in the Quorum BDS's filename as returned by query-block. As a nice side effect of confirming that the new BDS actually belongs to the Quorum BDS, this checks whether the filename was properly updated. Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/041 | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)