From patchwork Tue Jun 25 01:50:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 1121703 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="WsdAptHd"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="R1kt8c8E"; 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 45Xq1j1HWLz9s7h for ; Tue, 25 Jun 2019 11:53:13 +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=payaZWu0Q4z+k2/VvBOMTcG1mewz8q0fDxDNA9hC4qM=; b=WsdAptHdlRbkELzBnmR/Znrxns W5/wy6ri5H/qbpyn6hhCXEIvOQccp7xsl0LJvE9AmX4mBLPQAFbI+x7AxqiYZcejE6UPWEoF/Nwi7 Rh6EDaWPgvRDg7HNBgBh39NytJNgl+X/Y4TtatlP3Hpi54XTuE5Bmd2jdeD/YWBsIqlH2arChDfIs rD/wxm1IJbvzvlIY8kOEGcV90a/beNKCSiVN7OYrPdLUlziR73joykK6MxZbPb84sCpDNO5INIMKj gpQ5han3M0X5ssLo+I2z+WDvtFVa8ZqVcrw0lY1ZU9m7HDjGQdr9SnqOzR6vsi60JVO26r0Femroe w9f2B4pw==; 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 1hfadw-0000aN-El; Tue, 25 Jun 2019 01:53:08 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hfacS-0007OO-Gk for hostap@lists.infradead.org; Tue, 25 Jun 2019 01:51:37 +0000 Received: by mail-pf1-x442.google.com with SMTP id r7so8556279pfl.3 for ; Mon, 24 Jun 2019 18:51:36 -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=XpTVpWqCcqCSM1wVoBKRkeTh+tD0HDsDcHHOSUs3LMs=; b=R1kt8c8EQOS1NN1SdGSz8y7Pz/FEecWxolFoa//uWLWsffwwsp9H+gz/bp+P6O0Rpr Ijr5sIQQuGmh4N023zffLX1KSaWmSPVFIwFcvhoGoQCzxqe+uVaaEZQk1PP1pEC7YdxF bY43LRr1MnE1v/ZLHWZqbYtB7iRAy3GW+zNkbAGLmvsUSxvp3x2DIPrXxNSu9UDHDn3h DAw8J6w/8KWvwMHFNZBwEOlT5NKeY1ifkYRt48KXXCaju/Ls/0joA2442A5OowAb1P8A M+9vkK4XdG+6m70pjAFIN9ZzMtY7Q5OCdOXIizderE/bT9gd97kU1f4Cp27OhZONhAn9 oSbA== 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=XpTVpWqCcqCSM1wVoBKRkeTh+tD0HDsDcHHOSUs3LMs=; b=pwzDf9W7WF+li9ukIj0Dz8s59Zcx31jNrd9lFavG8LvmMXl6FlsGcgUR7Xw7e6827i qEbY+DVB+GgDbUV5wRDRk2/vfujn+Yr6rt9YSc03UgppgVRSzHPsrIlKio7SBVCnRoHf wB61+5KQvV1PIzWmm4FkgMJfG8wPNdQYDaLbAIsaU1S9ra/oHXd2N8rNthxIcgCxgpxJ XQBcu94nTVUgRmsZPNT5+SAvT5hxErls0fJ2LohWUcmUcb0uREY11Hh1q3hhmA5AiTDh NSwLKl50ypK73Wr2RDxt+hBAX+kjcO0zUAP18/h3obnVaVYURJFVSlsux4to+7jGraZp +9HA== X-Gm-Message-State: APjAAAVqhmsrSosueq3VHeYjWUmpb87lyWnNK3tQf+PPPJLMFdTAs4rb jFDnRLOkhBt7Sq8iQp+slumqjOtJ X-Google-Smtp-Source: APXvYqzH19grBjQod8XqNSyn4bk9mJtPIHMSM1aTx3nFMjq840INxZfmdFYhFUPEsbf2aczCQlaENQ== X-Received: by 2002:a17:90a:cf8f:: with SMTP id i15mr27318299pju.110.1561427495195; Mon, 24 Jun 2019 18:51:35 -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.33 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 24 Jun 2019 18:51:34 -0700 (PDT) From: Masashi Honma To: hostap@lists.infradead.org Subject: [PATCH 11/32] tests: Fix rrm_beacon_req_passive_scan_vht160 false negative by using common finalizer Date: Tue, 25 Jun 2019 10:50:48 +0900 Message-Id: <20190625015109.6705-11-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_185136_592859_BD705EAC X-CRM114-Status: UNSURE ( 9.24 ) 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:442 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 rrm_beacon_req_passive_scan_vht160 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_rrm.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/hwsim/test_rrm.py b/tests/hwsim/test_rrm.py index 9f2351544..d3343bb0e 100644 --- a/tests/hwsim/test_rrm.py +++ b/tests/hwsim/test_rrm.py @@ -17,7 +17,7 @@ import time import hostapd from wpasupplicant import WpaSupplicant from utils import HwsimSkip, alloc_fail, fail_test, wait_fail_trigger -from utils import disable_hapd, clear_regdom_dev +from utils import disable_hapd, clear_regdom_dev, clear_regdom from test_ap_ht import clear_scan_cache from remotehost import remote_compatible from test_ap_vht import vht_supported @@ -1714,12 +1714,7 @@ def test_rrm_beacon_req_passive_scan_vht160(dev, apdev): raise HwsimSkip("ZA regulatory rule likely did not have DFS requirement removed") raise finally: - if hapd: - hapd.request("DISABLE") - dev[0].disconnect_and_stop_scan() - subprocess.call(['iw', 'reg', 'set', '00']) - dev[0].wait_event(["CTRL-EVENT-REGDOM-CHANGE"], timeout=0.5) - dev[0].flush_scan_cache() + clear_regdom(hapd, dev) def test_rrm_beacon_req_ap_errors(dev, apdev): """Beacon request - AP error cases"""