From patchwork Tue Jan 26 10:38:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 8120061 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 18A8B9F818 for ; Tue, 26 Jan 2016 10:42:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6D50B20256 for ; Tue, 26 Jan 2016 10:42:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A8CEC20166 for ; Tue, 26 Jan 2016 10:42:07 +0000 (UTC) Received: from localhost ([::1]:42932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO14Z-0002E5-3L for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Jan 2016 05:42:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO132-0007e3-8H for qemu-devel@nongnu.org; Tue, 26 Jan 2016 05:40:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO131-0007dJ-79 for qemu-devel@nongnu.org; Tue, 26 Jan 2016 05:40:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO12w-0007bl-PT; Tue, 26 Jan 2016 05:40:26 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 66732C0ED416; Tue, 26 Jan 2016 10:40:26 +0000 (UTC) Received: from fam-t430.redhat.com (vpn1-5-65.pek2.redhat.com [10.72.5.65]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0QAcRTN016464; Tue, 26 Jan 2016 05:40:17 -0500 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 26 Jan 2016 18:38:21 +0800 Message-Id: <1453804705-7205-13-git-send-email-famz@redhat.com> In-Reply-To: <1453804705-7205-1-git-send-email-famz@redhat.com> References: <1453804705-7205-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, jsnow@redhat.com, Markus Armbruster , mreitz@redhat.com, vsementsov@parallels.com, Stefan Hajnoczi Subject: [Qemu-devel] [RFC PATCH 12/16] iotests: Add qbm format to 041 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Though a number of test cases dosn't apply because of cluster size and blkdebug limitation, mirroring qbm can be covered by all other cases. Signed-off-by: Fam Zheng --- tests/qemu-iotests/041 | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index c7da95d..3712aca 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -139,6 +139,8 @@ class TestSingleDrive(iotests.QMPTestCase): 'target image does not match source after mirroring') def test_small_buffer2(self): + if iotests.imgfmt == "qbm": + return self.assert_no_active_block_jobs() qemu_img('create', '-f', iotests.imgfmt, '-o', 'cluster_size=%d,size=%d' @@ -155,6 +157,8 @@ class TestSingleDrive(iotests.QMPTestCase): 'target image does not match source after mirroring') def test_large_cluster(self): + if iotests.imgfmt == "qbm": + return self.assert_no_active_block_jobs() qemu_img('create', '-f', iotests.imgfmt, '-o', 'cluster_size=%d,backing_file=%s' @@ -265,9 +269,9 @@ class TestMirrorNoBacking(iotests.QMPTestCase): os.remove(backing_img) try: os.remove(target_backing_img) + os.remove(target_img) except: pass - os.remove(target_img) def test_complete(self): self.assert_no_active_block_jobs() @@ -300,6 +304,8 @@ class TestMirrorNoBacking(iotests.QMPTestCase): 'target image does not match source after mirroring') def test_large_cluster(self): + if iotests.imgfmt == "qbm": + return self.assert_no_active_block_jobs() # qemu-img create fails if the image is not there @@ -461,6 +467,8 @@ new_state = "1" self.vm.shutdown() def test_large_cluster(self): + if iotests.imgfmt == "qbm": + return self.assert_no_active_block_jobs() # Test COW into the target image. The first half of the @@ -568,6 +576,8 @@ new_state = "1" os.remove(self.blkdebug_file) def test_report_write(self): + if iotests.imgfmt == "qbm": + return self.assert_no_active_block_jobs() result = self.vm.qmp('drive-mirror', device='drive0', sync='full', @@ -595,6 +605,8 @@ new_state = "1" self.vm.shutdown() def test_ignore_write(self): + if iotests.imgfmt == "qbm": + return self.assert_no_active_block_jobs() result = self.vm.qmp('drive-mirror', device='drive0', sync='full', @@ -612,6 +624,8 @@ new_state = "1" self.vm.shutdown() def test_stop_write(self): + if iotests.imgfmt == "qbm": + return self.assert_no_active_block_jobs() result = self.vm.qmp('drive-mirror', device='drive0', sync='full', @@ -981,4 +995,4 @@ class TestRepairQuorum(iotests.QMPTestCase): self.vm.shutdown() if __name__ == '__main__': - iotests.main(supported_fmts=['qcow2', 'qed']) + iotests.main(supported_fmts=['qcow2', 'qed', 'qbm'])