From patchwork Tue Feb 12 14:35:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1040625 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=none (p=none dis=none) header.from=mind.be Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="XCjny9ZP"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind-be.20150623.gappssmtp.com header.i=@mind-be.20150623.gappssmtp.com header.b="P8i8ayAe"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43zQFM0hPKz9s3x for ; Wed, 13 Feb 2019 01:36:07 +1100 (AEDT) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=REt4YLaomDzYzCpXiD7yUoyJn+YLt0P1MFd/8lJ3K90=; b=XCjny9ZPtD5JB4 a+2RlpW2q3R1bPmF/zhYjxbO+wpaTwRwtGL8AsntflipKS9XP3FOXo5grbz8EshvHIl75gYg4xbrv qKZn5mtM1jz46PU5MHXUancWSASVUhGWck8qum+RgzmeqW9N0CgApHd/5UOTj47yk2ZauzbaVjwG9 cQt4ymbv6zR5mef9fWy9wYparIvV0+gDUPlMzIvWctFTSaBTo5Ia8P6y0nmsSGBnQD4qcnw0+xlnN unG40pKuCqcilGvUqEj/An91e2m+yd0h+cCD5CmREXC9FKBo/Mi8I5L/qu7G3/nhPYZ1cx6xswgp+ uA6eh1hkMNWpiF48353w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gtZAD-0000gU-Ta; Tue, 12 Feb 2019 14:35:57 +0000 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gtZAA-0000ec-Kx for hostap@lists.infradead.org; Tue, 12 Feb 2019 14:35:56 +0000 Received: by mail-ed1-x52f.google.com with SMTP id d9so2348519edh.12 for ; Tue, 12 Feb 2019 06:35:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind-be.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qbWqgWQoWyhQeC2sslMyWr0BL7hjmBTmxmJXbw5zjD8=; b=P8i8ayAeAgcMQ9s6Ig7f+34yb0uGsOWk00ZmZHsiwK+f1F3++FwS187hIapn7vs2hK W1bSETPXsZXK55pk83lrMn5jgnTEw1bLWOGzwTvnEYTEY+KVhxHdWf8saqt0MN6TwiS2 zw9J05NX0u/xaL8oBdWcE43QDq7z2zf6uCAwTfYMLQJi5HUFUaml7pwTjmFqgPXkOvt4 ooJNgEZi6CKhtOFGbHBkPvSAMLCLsgJOT7hMOYxC2oGnHE/A474u+Izienc1VCN0Bn2H gs2Yf8Jqs4p9euhWaoInZUow0G2AQ2W1JBcFjdiNRMyepxTbob8jnCaz7v4WjBon2062 ZgFg== 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:mime-version:content-transfer-encoding; bh=qbWqgWQoWyhQeC2sslMyWr0BL7hjmBTmxmJXbw5zjD8=; b=lSYgDdMrdqUedfSnrnwWjqr/APcTa3BPkFTn0D6xNmkoXyUuQvMvAtJO7sGIZRR4pa NHrsFIdQ5k6gpO2DEhheRG4ZHtOk+ufrgFHykjQHqfZq4Iyv5YR8mbzdmqGIC0M1alnF sNcCS0IolPOpZpwuOVITB3ppTCCj64QPKCkaMmUQacC/eNcdTOyEKQZZhpG4oA9O+jcq VpRuP0oLn4eGZl+fJ6ZFLwnY4PH+HeRyMV5Imxgl/q43OtkATsPt1PfQpWWlp99ET0JJ kdYdmCMSZ/NEtyBiW3l46W+nENTidWlTiWIpxROk9nSkEX6azdO3kOAIBMMWnLo2Lr/R P8FA== X-Gm-Message-State: AHQUAuYGhsVzYdgTO9wmZW8dxwF23JKZHhR/wG//H7w8aKQNg+H8eJAJ fbDFub8XRZZbF3Q+fHZCY8jZ+7IKqZ8= X-Google-Smtp-Source: AHgI3IYmO+BcPnzE9ZPJ3xE/mLBaPwUirXL6EXGc4C8TXPHI2jo2lHVSzBLoCdyWhwKlJUuXot7vIQ== X-Received: by 2002:a50:d311:: with SMTP id g17mr3272935edh.187.1549982152300; Tue, 12 Feb 2019 06:35:52 -0800 (PST) Received: from arnout-laptop.local.ess-mail.com (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id w28sm3969672edd.38.2019.02.12.06.35.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Feb 2019 06:35:51 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: hostap@lists.infradead.org Subject: [PATCH v4 1/7] tests: refactor test_multi_ap Date: Tue, 12 Feb 2019 15:35:22 +0100 Message-Id: <20190212143528.5513-2-arnout@mind.be> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190212143528.5513-1-arnout@mind.be> References: <20190212143528.5513-1-arnout@mind.be> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190212_063554_725172_C7154B90 X-CRM114-Status: UNSURE ( 9.52 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:52f listed in] [list.dnswl.org] 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Arnout Vandecappelle \(Essensium/Mind\)" Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org With just one additional argument, the run_multi_ap_association function can be used for all tests. While we're at it, also move it to the top of the file. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- v4: new patch --- tests/hwsim/test_multi_ap.py | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/tests/hwsim/test_multi_ap.py b/tests/hwsim/test_multi_ap.py index 709382d98..94d39dce2 100644 --- a/tests/hwsim/test_multi_ap.py +++ b/tests/hwsim/test_multi_ap.py @@ -6,6 +6,15 @@ import hostapd +def run_multi_ap_association(dev, apdev, multi_ap, wait_connect=True): + params = hostapd.wpa2_params(ssid="multi-ap", passphrase="12345678") + if multi_ap: + params["multi_ap"] = str(multi_ap) + hapd = hostapd.add_ap(apdev[0], params) + + dev[0].connect("multi-ap", psk="12345678", scan_freq="2412", + multi_ap_backhaul_sta="1", wait_connect=wait_connect) + def test_multi_ap_association(dev, apdev): """Multi-AP association in backhaul BSS""" run_multi_ap_association(dev, apdev, 1) @@ -28,21 +37,9 @@ def test_multi_ap_association_shared_bss(dev, apdev): run_multi_ap_association(dev, apdev, 3) dev[1].connect("multi-ap", psk="12345678", scan_freq="2412") -def run_multi_ap_association(dev, apdev, multi_ap): - params = hostapd.wpa2_params(ssid="multi-ap", passphrase="12345678") - params["multi_ap"] = str(multi_ap) - hapd = hostapd.add_ap(apdev[0], params) - - dev[0].connect("multi-ap", psk="12345678", multi_ap_backhaul_sta="1", - scan_freq="2412") - def test_multi_ap_disabled_on_ap(dev, apdev): """Multi-AP association attempt when disabled on AP""" - params = hostapd.wpa2_params(ssid="multi-ap", passphrase="12345678") - hapd = hostapd.add_ap(apdev[0], params) - - dev[0].connect("multi-ap", psk="12345678", multi_ap_backhaul_sta="1", - scan_freq="2412", wait_connect=False) + run_multi_ap_association(dev, apdev, 0, wait_connect=False) ev = dev[0].wait_event([ "CTRL-EVENT-DISCONNECTED", "CTRL-EVENT-CONNECTED" ], timeout=5) @@ -54,12 +51,7 @@ def test_multi_ap_disabled_on_ap(dev, apdev): def test_multi_ap_fronthaul_on_ap(dev, apdev): """Multi-AP association attempt when only fronthaul BSS on AP""" - params = hostapd.wpa2_params(ssid="multi-ap", passphrase="12345678") - params["multi_ap"] = "2" - hapd = hostapd.add_ap(apdev[0], params) - - dev[0].connect("multi-ap", psk="12345678", multi_ap_backhaul_sta="1", - scan_freq="2412", wait_connect=False) + run_multi_ap_association(dev, apdev, 2, wait_connect=False) ev = dev[0].wait_event([ "CTRL-EVENT-DISCONNECTED", "CTRL-EVENT-CONNECTED", "CTRL-EVENT-ASSOC-REJECT" ],