From nobody Wed Nov 27 06:51:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1699894667; cv=none; d=zohomail.com; s=zohoarc; b=RRAp4C/qbKi52IG+b4mePq354BqoKCpyFy07j6FMl7o3akWdhHdS3ZyMJNKIO2F6gOeucUh7eceCaR8rGvIQkkXlx6nGT8c+2Ih1WuRJXMyyQc5x+GsLwkIoYKmvWdGJ7USf5GUITUQ2QQatnnzEd5+N7AJLr6X0ntw2wYXq2iA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699894667; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=O2cygzdeeBoVdlm2DPo8FVP07g8M/WsfMDUifTuJX5w=; b=IbQHZuO0EXp6xNcVfH8e+H0CjkBt5/cQa7aybKyvUAByfHyY3qy57dN2XzE9LTtwe6Stx+CeVAgculUAUt1LGqfPynUz9yUQYmIMjdFznGHJ6McWCh7pCv2OKI3u5+kmStJLOgdJ/j4dWBuvcweXv09OQmzbdqo95YazAWufxNc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169989466793490.66997323135467; Mon, 13 Nov 2023 08:57:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r2aF1-00032S-Nt; Mon, 13 Nov 2023 11:56:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r2aF0-00032K-3M for qemu-devel@nongnu.org; Mon, 13 Nov 2023 11:56:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r2aEy-0002Xf-HP for qemu-devel@nongnu.org; Mon, 13 Nov 2023 11:56:49 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-3-BBm3MD7_MouP2P62i36dvA-1; Mon, 13 Nov 2023 11:56:44 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 28B598058ED; Mon, 13 Nov 2023 16:56:44 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id 095B340C6EB9; Mon, 13 Nov 2023 16:56:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699894607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=O2cygzdeeBoVdlm2DPo8FVP07g8M/WsfMDUifTuJX5w=; b=TQ8sq/OJVq6jAj/flE3v2UQhjuq2EGwEjfpfSeExTKjBRav0ZctZBbkvJqeHxEzPoss4wE eKxK+vUMxAyE6RdTTinqYuLrUe0yToJUy60fGals9CjVpa2WmwtuOmRNXw76JmWdZDortU AKuWHpXXpNXFh9yx7hrIorIGz8lmMuw= X-MC-Unique: BBm3MD7_MouP2P62i36dvA-1 From: Thomas Huth To: Hanna Reitz , Kevin Wolf , qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: Paolo Bonzini Subject: [PATCH v2] tests/qemu-iotests/149: Use more inclusive language in this test Date: Mon, 13 Nov 2023 17:56:42 +0100 Message-ID: <20231113165642.62012-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1699894670247100003 Content-Type: text/plain; charset="utf-8" Let's use 'unsupported_configs' and 'tested_configs' here instead of non-inclusive words. Suggested-by: Paolo Bonzini Signed-off-by: Thomas Huth --- v2: Use different wordings (suggested by Paolo) tests/qemu-iotests/149 | 16 +++++++++------- tests/qemu-iotests/149.out | 8 ++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149 index 2ae318f16f..2a8bb5787f 100755 --- a/tests/qemu-iotests/149 +++ b/tests/qemu-iotests/149 @@ -518,7 +518,7 @@ configs =3D [ =20 ] =20 -blacklist =3D [ +unsupported_configs =3D [ # We don't have a cast-6 cipher impl for QEMU yet "cast6-256-xts-plain64-sha1", "cast6-128-xts-plain64-sha1", @@ -528,17 +528,19 @@ blacklist =3D [ "twofish-192-xts-plain64-sha1", ] =20 -whitelist =3D [] +# Optionally test only the configurations in the LUKS_CONFIG +# environment variable +tested_configs =3D None if "LUKS_CONFIG" in os.environ: - whitelist =3D os.environ["LUKS_CONFIG"].split(",") + tested_configs =3D os.environ["LUKS_CONFIG"].split(",") =20 for config in configs: - if config.name in blacklist: - iotests.log("Skipping %s in blacklist" % config.name) + if config.name in unsupported_configs: + iotests.log("Skipping %s (cipher not supported)" % config.name) continue =20 - if len(whitelist) > 0 and config.name not in whitelist: - iotests.log("Skipping %s not in whitelist" % config.name) + if tested_configs is not None and config.name not in tested_configs: + iotests.log("Skipping %s (not in LUKS_CONFIG)" % config.name) continue =20 test_once(config, qemu_img=3DFalse) diff --git a/tests/qemu-iotests/149.out b/tests/qemu-iotests/149.out index 2cc5b82f7c..3c731bdf95 100644 --- a/tests/qemu-iotests/149.out +++ b/tests/qemu-iotests/149.out @@ -470,7 +470,7 @@ sudo cryptsetup -q -v luksClose qiotest-145-cast5-128-c= bc-plain64-sha1 # Delete image unlink TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img =20 -Skipping cast6-256-xts-plain64-sha1 in blacklist +Skipping cast6-256-xts-plain64-sha1 (cipher not supported) # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dm-crypt aes-256-cbc= -plain-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image truncate TEST_DIR/luks-aes-256-cbc-plain-sha1.img --size 4194304MB @@ -1297,7 +1297,7 @@ sudo cryptsetup -q -v luksClose qiotest-145-twofish-1= 28-xts-plain64-sha1 # Delete image unlink TEST_DIR/luks-twofish-128-xts-plain64-sha1.img =20 -Skipping twofish-192-xts-plain64-sha1 in blacklist +Skipping twofish-192-xts-plain64-sha1 (cipher not supported) # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dm-crypt serpent-128= -xts-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image truncate TEST_DIR/luks-serpent-128-xts-plain64-sha1.img --size 4194304MB @@ -1534,8 +1534,8 @@ sudo cryptsetup -q -v luksClose qiotest-145-serpent-1= 92-xts-plain64-sha1 # Delete image unlink TEST_DIR/luks-serpent-192-xts-plain64-sha1.img =20 -Skipping cast6-128-xts-plain64-sha1 in blacklist -Skipping cast6-192-xts-plain64-sha1 in blacklist +Skipping cast6-128-xts-plain64-sha1 (cipher not supported) +Skipping cast6-192-xts-plain64-sha1 (cipher not supported) # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dm-crypt aes-256-xts= -plain64-sha224 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image truncate TEST_DIR/luks-aes-256-xts-plain64-sha224.img --size 4194304MB --=20 2.41.0