From patchwork Tue Jun 25 01:50:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 1121700 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="NMfokwbs"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PIomm/mk"; 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 45Xq194HRZz9s7h for ; Tue, 25 Jun 2019 11:52:45 +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=8Me1qFgmGVrdRD2SCwDV/piBcME1IAMUNVwnWkjXpM0=; b=NMfokwbs0BbPeiNjnnwxbFSZyA Zcd59XF26x+63egVsMcc8OWNBDSQgODZbQHT9FStCbK24W1Wtxm0XqfPakry1hRC6EfucsIp67Vrv ULcYQ/kNQqcc1JbO08T+NRJQ0SyVgnxWbvE4BRJHv580kXc0Fp3hHVVuNfbrWPwzXRaxL12vIJMIO irZ3wX6xVUG8z+UZ4Bxx1CAb0LIcKUO+r42i2UStNHmRUzWZ+f3kS9KgI0jQI5uSRYitYvTqzMhlq 10QcC/GmD4Ci6Lj44S9nI7YXrZQNKJrAwddODD9ZkcLbeGmLrvSYGVohWkdWCrHpUsUbriJ6rYajQ vfEttxhA==; 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 1hfadV-00005h-Fn; Tue, 25 Jun 2019 01:52:41 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hfacN-0007Hq-LL for hostap@lists.infradead.org; Tue, 25 Jun 2019 01:51:33 +0000 Received: by mail-pf1-x443.google.com with SMTP id 81so8525818pfy.13 for ; Mon, 24 Jun 2019 18:51:31 -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=DNLUBwyCCOX0FcRUjZ7AB0IezFQ7Znylw/0F2Qn5Ipo=; b=PIomm/mkTuNjhLd6Fl9vNT3OEn2dmni0KpE+T6ywqY01FwvAx4YS5+FiUJriv362xK Ut8Dsc1JPKP56AgECkIScdtLwZPpN8nY5JPY9ogjPpodH9mgETJ7ZBjhR9dHhxVPXjOc YXf3EdfdJsxgUODCinil2ospRaVsztkuvZc4eyPX5jJ6Y9r/ErA482Y7iY1KjsU3hzp7 pOMpjb9QT0m0W/Jvo9xBv73NwVhJtd/vJ33OHEvbrPyL30XomDyJlSGyOWWvYlMSJXc4 ZBCWSFdjElQyRUPOTCHeetK14qNXrozjMl0dZ54lCMKkK+S4j+RIja58O1DeRUspAZiH 9Mkw== 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=DNLUBwyCCOX0FcRUjZ7AB0IezFQ7Znylw/0F2Qn5Ipo=; b=LP8mKjjvCzm9ELiQECZFM45zsljlKRVt/mS4KR0VDagS75yLQDNiJl3cDirxXvKqMq CcwUaI1CyXfaYPzaUS+nULWJR0uSwET+H5qJ9qoiRkfluBoJOn1TkThLQfmq9zzQ73Th +6d4jqV0TtxtioM/EtQyuR2oLa/a/rBgMngpMfk/G0TDiXHNtaoKk14aS5SLAZIqP9rb UWcfcf4tQGxdHvCCZ7LDXVJNAaK01MmgAVsdnh0V00IQD4bX4DXISqhQBWBTT9lqFKV+ obYnjeMzitjeKBDRjfotmNom6PCGd+vdWvp71fG7BdEP2mrpIxI/4FfwTqot3Fy1/zkG uoCA== X-Gm-Message-State: APjAAAUJCwu8QwDdy+ibBsfUAqcQeEPO8UHhUdvTdf5K9NOOsEs6dRzv N6Vo0ABcsDH0R1BtLVvxXdqCPkGh X-Google-Smtp-Source: APXvYqwG1C1+kka72A0PiduzIHydEz2ECLYXlNIOAg9I0bB3siKhhCQ/8hkJUQpG5J+I/cBVyHg4fA== X-Received: by 2002:a17:90a:cb15:: with SMTP id z21mr28592258pjt.87.1561427490395; Mon, 24 Jun 2019 18:51:30 -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.29 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 24 Jun 2019 18:51:29 -0700 (PDT) From: Masashi Honma To: hostap@lists.infradead.org Subject: [PATCH 08/32] tests: Fix ap_ht40_5ghz_invalid_pair false negative by using common finalizer Date: Tue, 25 Jun 2019 10:50:45 +0900 Message-Id: <20190625015109.6705-8-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_185131_748259_1538613F X-CRM114-Status: UNSURE ( 9.89 ) 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:443 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_ht40_5ghz_invalid_pair fails with this message. --------------- wlan0: Country code not reset back to 00: is US wlan0: Country code cleared back to 00 --------------- This patch fixes the issue. Signed-off-by: Masashi Honma --- tests/hwsim/test_ap_ht.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/hwsim/test_ap_ht.py b/tests/hwsim/test_ap_ht.py index 9c6f1e447..2ee1af849 100644 --- a/tests/hwsim/test_ap_ht.py +++ b/tests/hwsim/test_ap_ht.py @@ -12,7 +12,7 @@ import struct import hostapd from wpasupplicant import WpaSupplicant -from utils import HwsimSkip, alloc_fail, parse_ie +from utils import HwsimSkip, alloc_fail, parse_ie, clear_regdom import hwsim_utils from test_ap_csa import csa_supported @@ -1267,7 +1267,7 @@ def test_ap_ht40_5ghz_invalid_pair(dev, apdev): if sec != "0": raise Exception("Invalid 40 MHz channel accepted") finally: - set_world_reg(apdev[0], None, None) + clear_regdom(hapd, dev) @remote_compatible def test_ap_ht40_5ghz_disabled_sec(dev, apdev):