From nobody Tue Nov 11 22:45:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1566247104; cv=none; d=zoho.com; s=zohoarc; b=h63kmQ3TJgM2TOa/ANtojTXWOkFt/k1fZsuuOUMJbniAfyYeMr2AApbRl6xvnlNSd4mOXNOJDIzREo9VvbKb+u48+KmOZuNG0/hbJZPZK9hRcfPMVGt8tIu1p5GmirBo6VI+0mtHS7mozfdNpcdSW/mIWJy4GC/VcRCmTqFdC8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566247104; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=rznVv1a0Txp4PxguI32gBp+/jB6BzPAfJodX84+kB44=; b=Bfw59mrBTfFsT7WFhI8G4aGjsVOlwW+JyeSVA76lkigMNQUkP8rEuxgKPNZer4Gi7Ao1VA/cOUQIRy4XlurgfO33XQ4e9J8pnAvtrDzIjB7ypPP7UIqXaAnh1HtjU+OvRWEAOxBBf2Ti76c82X9AWLQvLj1md3E7/ltXxNiHLkA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1566247104095684.086222590506; Mon, 19 Aug 2019 13:38:24 -0700 (PDT) Received: from localhost ([::1]:57580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzoQ0-0001Xu-Go for importer@patchew.org; Mon, 19 Aug 2019 16:38:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45850) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzo7U-0001Jf-Om for qemu-devel@nongnu.org; Mon, 19 Aug 2019 16:19:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hzo7T-0004Pn-Kw for qemu-devel@nongnu.org; Mon, 19 Aug 2019 16:19:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52216) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hzo7R-0004Oa-4i; Mon, 19 Aug 2019 16:19:09 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5953E3001AB7; Mon, 19 Aug 2019 20:19:08 +0000 (UTC) Received: from localhost (ovpn-204-64.brq.redhat.com [10.40.204.64]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E400C1001959; Mon, 19 Aug 2019 20:19:07 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 19 Aug 2019 22:18:46 +0200 Message-Id: <20190819201851.24418-4-mreitz@redhat.com> In-Reply-To: <20190819201851.24418-1-mreitz@redhat.com> References: <20190819201851.24418-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 19 Aug 2019 20:19:08 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 3/8] iotests: Allow skipping test cases X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" case_notrun() does not actually skip the current test case. It just adds a "notrun" note and then returns to the caller, who manually has to skip the test. Generally, skipping a test case is as simple as returning from the current function, but not always: For example, this model does not allow skipping tests already in the setUp() function. Thus, add a QMPTestCase.case_skip() function that invokes case_notrun() and then self.skipTest(). To make this work, we need to filter the information on how many test cases were skipped from the unittest output. Signed-off-by: Max Reitz Reviewed-by: Andrey Shinkevich Reviewed-by: John Snow --- tests/qemu-iotests/iotests.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 84438e837c..2f53baf633 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -802,6 +802,11 @@ class QMPTestCase(unittest.TestCase): return self.pause_wait(job_id) return result =20 + def case_skip(self, reason): + '''Skip this test case''' + case_notrun(reason) + self.skipTest(reason) + =20 def notrun(reason): '''Skip this test suite''' @@ -813,7 +818,10 @@ def notrun(reason): sys.exit(0) =20 def case_notrun(reason): - '''Skip this test case''' + '''Mark this test case as not having been run, but do not actually + skip it; that is left to the caller. See QMPTestCase.case_skip() + for a variant that actually skips the current test case.''' + # Each test in qemu-iotests has a number ("seq") seq =3D os.path.basename(sys.argv[0]) =20 @@ -904,8 +912,15 @@ def execute_unittest(output, verbosity, debug): unittest.main(testRunner=3Drunner) finally: if not debug: - sys.stderr.write(re.sub(r'Ran (\d+) tests? in [\d.]+s', - r'Ran \1 tests', output.getvalue())) + out =3D output.getvalue() + out =3D re.sub(r'Ran (\d+) tests? in [\d.]+s', r'Ran \1 tests'= , out) + + # Hide skipped tests from the reference output + out =3D re.sub(r'OK \(skipped=3D\d+\)', 'OK', out) + out_first_line, out_rest =3D out.split('\n', 1) + out =3D out_first_line.replace('s', '.') + '\n' + out_rest + + sys.stderr.write(out) =20 def execute_test(test_function=3DNone, supported_fmts=3D[], supported_oses=3D['linux'], --=20 2.21.0