From patchwork Tue Jun 25 01:50:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 1121705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="IvZlQ3B+"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VbcwOuEq"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45Xq286QJPz9s7h for ; Tue, 25 Jun 2019 11:53:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=dqNN4WfrCdrv6Q5rUe/uZGtncJIMBD/ZpyF5ZMabfwc=; b=IvZlQ3B+67Xfeix//olL3b1h69 mz2hdk9Ms0QF6SGkOVgvyuHVWT/EdYiLOBzXk9BWw5eDfVKgE+19b1Ta9b2Sjt7OqVKroCRPYoNK6 Flj2ZQBYVpeihkoFyPFHMgkspaHhaoxkTPm/T7dY5q+gWZfICBsvScxdAwmfW1fK5v3cOtznazewK bbnM9BX4yzxw+OZ0u3EUgIOW0oHP2EEcqOfOGB6FNzpdL9pJued80qbf3zTGvs0+zKk2Bz9sNBiNP kZdiJjDZbB/ro35zxKVW5eK3kEmLg6qbDAvvTHh/XLE5QpdHFFXseGG5ZIvucG7FLF5XS6O6xv2Ei LYgnlVPA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hfaeK-00013V-Mn; Tue, 25 Jun 2019 01:53:32 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hfacU-0007Q9-3T for hostap@lists.infradead.org; Tue, 25 Jun 2019 01:51:39 +0000 Received: by mail-pl1-x642.google.com with SMTP id t7so7894232plr.11 for ; Mon, 24 Jun 2019 18:51:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IPZRD46jimqC7ZAaY8tLdtuz7S5PbIMkU17A6q5XJ9k=; b=VbcwOuEqjX3UHV6FMoIyCUG07lEv9+iqt8qnPSzyIS4rftLJulIOvCr4X79wEcKSx+ rTUWriIOlYid4rLgQzXBpfn5HPakJ0Y6n/+RCDq7yaqCAHa6KexzVwul9dPK798vqRHs IMrVc+A6Lkm5UW0AeTxnmcvh1QpCkh02H0SXuPsx8S/rzpmYZhtqSI2AIX7E5o0QPGsC tYHKzVCx4Q71G/4OvIBZC4Bn0dJY4XLi4PHSPkAWCio7AyN0WR8JsSrjHyJKm8/xdqUT A3k7YC6x72RBgEYci8jmDx8RRSyeteW4+cOKbjkN55EKLvmC0Wk0bgQ5ZPoabB+vj+kw 96Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IPZRD46jimqC7ZAaY8tLdtuz7S5PbIMkU17A6q5XJ9k=; b=FLoM4W7yGCBW4/oTnOf+YbVh94nCwWrsTkxM6/0Pn2z1fE9oON99O8rVcl1MowMuMR x/TYPX3lUlD0s29wrIDYVrPF2VL2mrsrcfKZIympVxGZaIQ8tcuRieM4yrrlm0H3YwU0 FDoBjAwnsoZ8h6hvCeW0RMErxxELE9ZznzRnjpXBMgYE6H9ChdjA4RDArd07zcsJc8Z5 h2qbglCoLc/mCgvP88YWVzsIpgwdZUb+Hc2tJgKmvRXbrpiq8u9dr0jzoXoJmc5XPR14 8y1s07ZD/mUNFWUuwtZn6bWSyCb8DipYiOOiqTLAuG7kvP+RWHHhUF5tqqlx/Of4hkvm jGVg== X-Gm-Message-State: APjAAAVNSYOxv7TqHxaI/dH2taGG5pNTBPv4dD2JbJZn7AtQtnmjR0J0 0mLCw3Tz45sYcRPPGS+/OjYc+Al5 X-Google-Smtp-Source: APXvYqzqCLHFQDEeLQTiROZlOw328hl7mf5DXM9uvExBLyiYEXzgdfCKMhVhDqrk6iI2rTicMJPo4A== X-Received: by 2002:a17:902:6ac6:: with SMTP id i6mr137867373plt.233.1561427496709; Mon, 24 Jun 2019 18:51:36 -0700 (PDT) Received: from gtx1600.flets-east.jp ([2409:11:321:2100:c417:b108:dc0e:cada]) by smtp.gmail.com with ESMTPSA id j64sm16013236pfb.126.2019.06.24.18.51.35 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 24 Jun 2019 18:51:36 -0700 (PDT) From: Masashi Honma To: hostap@lists.infradead.org Subject: [PATCH 12/32] tests: Fix ap_acs_vht160_scan_disable false negative by using common finalizer Date: Tue, 25 Jun 2019 10:50:49 +0900 Message-Id: <20190625015109.6705-12-masashi.honma@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190625015109.6705-1-masashi.honma@gmail.com> References: <20190625015109.6705-1-masashi.honma@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190624_185138_219419_42F46145 X-CRM114-Status: UNSURE ( 9.43 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:642 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (masashi.honma[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Masashi Honma MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org ap_acs_vht160_scan_disable fails with this message. --------------- wlan0: Country code not reset back to 00: is ZA wlan0: Country code cleared back to 00 --------------- This patch fixes the issue. Signed-off-by: Masashi Honma --- tests/hwsim/test_ap_acs.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/hwsim/test_ap_acs.py b/tests/hwsim/test_ap_acs.py index 2a5e1dc5f..db0828467 100644 --- a/tests/hwsim/test_ap_acs.py +++ b/tests/hwsim/test_ap_acs.py @@ -9,7 +9,7 @@ logger = logging.getLogger() import time import hostapd -from utils import skip_with_fips, alloc_fail, fail_test, HwsimSkip +from utils import skip_with_fips, alloc_fail, fail_test, HwsimSkip, clear_regdom from test_ap_ht import clear_scan_cache from test_dfs import wait_dfs_event @@ -314,9 +314,7 @@ def test_ap_acs_vht160_scan_disable(dev, apdev): params['ieee80211h'] = '1' hapd = hostapd.add_ap(apdev[0], params, wait_enabled=False) time.sleep(3) - hapd.request("DISABLE") - hostapd.cmd_execute(apdev[0], ['iw', 'reg', 'set', '00']) - time.sleep(0.1) + clear_regdom(hapd, dev) def test_ap_acs_bias(dev, apdev): """Automatic channel selection with bias values"""