From nobody Thu Dec 18 17:49:44 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1611671970; cv=none; d=zohomail.com; s=zohoarc; b=A49RSavV7TTu9v/G7oO7Y+UbwLcPquVwywSK7Iz19vAmzk93o/vZufso5/jIHuAhxN1+0XY8VNh/oQGKkbPTJdHXsb6AD/s0ph/EftT8rywr3tznpgJ+lG72tgBTGzO4jOj9DmIiLdU0glclPDAcb4vJDPhWsxxuNVog1Gq3A3U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611671970; h=Content-Type: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; bh=M03fhKs8+7gwOCLOFfDh8olykNfKXkilvJk7a2xvxh4=; b=l+BKy0UN6CoTTkxGHVmMh625bTIFaCOU7K5E9XGro1s903mUEMcB6x+QdEbqaRIQBzmqcBy9/y0OWWgc/HbhUYp1pxwIlfw6TH9FBtqRhLMTi6bcDD91ODBb4P3b/p5klDNytJM5U1C6HMbcX+UHKa3UzqEvLxV2i3xNXEkPD98= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1611671970025813.4043201664563; Tue, 26 Jan 2021 06:39:30 -0800 (PST) Received: from localhost ([::1]:55790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4PV8-000510-Ri for importer@patchew.org; Tue, 26 Jan 2021 09:39:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4PDe-0000I4-4E for qemu-devel@nongnu.org; Tue, 26 Jan 2021 09:21:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50674) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l4PDU-000694-Uc for qemu-devel@nongnu.org; Tue, 26 Jan 2021 09:21:21 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-438-squKQKa7PJaUdojaTAhPTA-1; Tue, 26 Jan 2021 09:21:08 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 28D7E195D58F; Tue, 26 Jan 2021 14:20:53 +0000 (UTC) Received: from localhost (ovpn-114-175.ams2.redhat.com [10.36.114.175]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B35A762A24; Tue, 26 Jan 2021 14:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611670870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M03fhKs8+7gwOCLOFfDh8olykNfKXkilvJk7a2xvxh4=; b=XPf/kcmyL5QUko9PLqzD7G+bMtS7oo6xRmAYUifs6X0MWCc/PtNdGELh2YGvpbDEZJCiT7 pDACBFylCt6XS7EbGVaDEw6xaPginwU8xq/8H/Y9cMjSCV+JDYTx/R8d5Dis5yNsn4bwiK Av15WRqrzHAbGymgwvQAtd2dENq7z1c= X-MC-Unique: squKQKa7PJaUdojaTAhPTA-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 15/53] iotests.py: Assume a couple of variables as given Date: Tue, 26 Jan 2021 15:19:38 +0100 Message-Id: <20210126142016.806073-16-mreitz@redhat.com> In-Reply-To: <20210126142016.806073-1-mreitz@redhat.com> References: <20210126142016.806073-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.255, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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 , Peter Maydell , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" There are a couple of environment variables that we fetch with os.environ.get() without supplying a default. Clearly they are required and expected to be set by the ./check script (as evidenced by execute_setup_common(), which checks for test_dir and qemu_default_machine to be set, and aborts if they are not). Using .get() this way has the disadvantage of returning an Optional[str] type, which mypy will complain about when tests just assume these values to be str. Use [] instead, which raises a KeyError for environment variables that are not set. When this exception is raised, catch it and move the abort code from execute_setup_common() there. Drop the 'assert iotests.sock_dir is not None' from iotest 300, because that sort of thing is precisely what this patch wants to prevent. Signed-off-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Willian Rampazzo Message-Id: <20210118105720.14824-2-mreitz@redhat.com> --- tests/qemu-iotests/300 | 1 - tests/qemu-iotests/iotests.py | 26 +++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tests/qemu-iotests/300 b/tests/qemu-iotests/300 index 23aca59d9c..38ef5945b7 100755 --- a/tests/qemu-iotests/300 +++ b/tests/qemu-iotests/300 @@ -28,7 +28,6 @@ import qemu =20 BlockBitmapMapping =3D List[Dict[str, Union[str, List[Dict[str, str]]]]] =20 -assert iotests.sock_dir is not None mig_sock =3D os.path.join(iotests.sock_dir, 'mig_sock') =20 =20 diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 2e89c0ab1a..45cb9bd288 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -75,12 +75,20 @@ qemu_opts =3D os.environ.get('QEMU_OPTIONS', '').strip(= ).split(' ') =20 imgfmt =3D os.environ.get('IMGFMT', 'raw') imgproto =3D os.environ.get('IMGPROTO', 'file') -test_dir =3D os.environ.get('TEST_DIR') -sock_dir =3D os.environ.get('SOCK_DIR') output_dir =3D os.environ.get('OUTPUT_DIR', '.') -cachemode =3D os.environ.get('CACHEMODE') -aiomode =3D os.environ.get('AIOMODE') -qemu_default_machine =3D os.environ.get('QEMU_DEFAULT_MACHINE') + +try: + test_dir =3D os.environ['TEST_DIR'] + sock_dir =3D os.environ['SOCK_DIR'] + cachemode =3D os.environ['CACHEMODE'] + aiomode =3D os.environ['AIOMODE'] + qemu_default_machine =3D os.environ['QEMU_DEFAULT_MACHINE'] +except KeyError: + # We are using these variables as proxies to indicate that we're + # not being run via "check". There may be other things set up by + # "check" that individual test cases rely on. + sys.stderr.write('Please run this test via the "check" script\n') + sys.exit(os.EX_USAGE) =20 socket_scm_helper =3D os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_help= er') =20 @@ -1286,14 +1294,6 @@ def execute_setup_common(supported_fmts: Sequence[st= r] =3D (), """ # Note: Python 3.6 and pylint do not like 'Collection' so use 'Sequenc= e'. =20 - # We are using TEST_DIR and QEMU_DEFAULT_MACHINE as proxies to - # indicate that we're not being run via "check". There may be - # other things set up by "check" that individual test cases rely - # on. - if test_dir is None or qemu_default_machine is None: - sys.stderr.write('Please run this test via the "check" script\n') - sys.exit(os.EX_USAGE) - debug =3D '-d' in sys.argv if debug: sys.argv.remove('-d') --=20 2.29.2