From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39217) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vl2Rp-0004R5-Ca for qemu-devel@nongnu.org; Mon, 25 Nov 2013 15:08:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vl2Rj-0005LM-2p for qemu-devel@nongnu.org; Mon, 25 Nov 2013 15:07:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:13411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vl2Ri-0005Kn-Po for qemu-devel@nongnu.org; Mon, 25 Nov 2013 15:07:51 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAPK7nmx029028 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 25 Nov 2013 15:07:50 -0500 From: Max Reitz Date: Mon, 25 Nov 2013 20:28:56 +0100 Message-Id: <1385407736-13941-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1385407736-13941-1-git-send-email-mreitz@redhat.com> References: <1385407736-13941-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH for-1.7 2/2] qemu-iotests: Fix test 041 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Stefan Hajnoczi , Max Reitz Performing multiple drive-mirror blockjobs on the same qemu instance results in the image file used for the block device being replaced by the newly mirrored file, which is not what we want. Fix this by performing one dedicated test per sync mode. Signed-off-by: Max Reitz --- tests/qemu-iotests/041 | 32 ++++++++++++++++++++++++-------- tests/qemu-iotests/041.out | 4 ++-- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index 5d40265..ec470b2 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -691,16 +691,32 @@ class TestUnbackedSource(ImageMirroringTestCase): os.remove(test_img) os.remove(target_img) - def test_absolute_paths(self): + def test_absolute_paths_full(self): + self.assert_no_active_block_jobs() + result = self.vm.qmp('drive-mirror', device='drive0', + sync='full', target=target_img, + mode='absolute-paths') + self.assert_qmp(result, 'return', {}) + self.complete_and_wait() + self.assert_no_active_block_jobs() + + def test_absolute_paths_top(self): + self.assert_no_active_block_jobs() + result = self.vm.qmp('drive-mirror', device='drive0', + sync='top', target=target_img, + mode='absolute-paths') + self.assert_qmp(result, 'return', {}) + self.complete_and_wait() self.assert_no_active_block_jobs() - for sync_mode in ['full', 'top', 'none']: - result = self.vm.qmp('drive-mirror', device='drive0', - sync=sync_mode, target=target_img, - mode='absolute-paths') - self.assert_qmp(result, 'return', {}) - self.complete_and_wait() - self.assert_no_active_block_jobs() + def test_absolute_paths_none(self): + self.assert_no_active_block_jobs() + result = self.vm.qmp('drive-mirror', device='drive0', + sync='none', target=target_img, + mode='absolute-paths') + self.assert_qmp(result, 'return', {}) + self.complete_and_wait() + self.assert_no_active_block_jobs() if __name__ == '__main__': iotests.main(supported_fmts=['qcow2', 'qed']) diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out index 4fd1c2d..6d9bee1 100644 --- a/tests/qemu-iotests/041.out +++ b/tests/qemu-iotests/041.out @@ -1,5 +1,5 @@ -......................... +........................... ---------------------------------------------------------------------- -Ran 25 tests +Ran 27 tests OK -- 1.8.4.2