From patchwork Thu Jan 24 07:45:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 1030300 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="T2PEnYgI"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lLz4i/El"; 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 43lZ4m2L63z9s9h for ; Thu, 24 Jan 2019 18:47:36 +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: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=UYPEF0tCo0Z7Bz+8vr5Zdy0Ym5/gpuTDnWaGXXUaXKY=; b=T2PEnYgIFoRlqem41ROBmI7ZRF ztEAa7P+Je3vHuYzRSqwDr0yK0MkvvLpfOTK0hiCrXWY9Qr8jJSx3gUdJmhmwImX0pXps/YEejbNB 0tV/gIaUKiSCyzC6bO5MChe3NgyfP18uWTrQiRxl5Yw9j+L3kFvSIU0HsBx0jo2rB3pKKqyDYQlLF 4U942HJXRazg2bzxGcD5UTcY9ZO0ozzhHHitVb4vrUat2A3tU0uS+yjrUC7TgF+funbzdINZycT9r 3rbkPGtVz/wdVkF5bOk6oR2tLwFEiC22hBjekyI0poeI9YhlnzwkkxMMBPmC1KOzWbYNMfC0ihbuW ooRSoI1w==; 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 1gmZjP-000671-1h; Thu, 24 Jan 2019 07:47:23 +0000 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gmZiu-0005go-7Q for hostap@lists.infradead.org; Thu, 24 Jan 2019 07:47:04 +0000 Received: by mail-pl1-x62b.google.com with SMTP id a14so2493915plm.12 for ; Wed, 23 Jan 2019 23:46:51 -0800 (PST) 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=WJ/lPuB9Vzy+z1eN8TyyT+PcfUk3bsrrkGnmnTEwDxA=; b=lLz4i/EljMJuuaZ2agV0/NI/GTr2KHiVM17o2QxOIR+OW0DRml/tuKyGeBVxDX4z11 enyX3EaeYKXVnKp4erZh9QBmLplk9KvOLzS5JV34hgJKf0Ko/NXVpO5v1X2v0Z5Id1CG hBZs+BgHcq7kztQopyvd9bztFlC+NOC3/PFpx1ve/NPIkF65t9GkFVLpOQJIQKu3zz/v Q9dG5U81mVnzgBrC984S+6iIaL/a1YhVwnuMGyf4OCZ/y2Rvo8gHZIDRFA/hN8KGGJIG AUHd9jmaLug+1upiW4dk0k+arES3YzUymHzcVHgS8k/j3A1OA8FgUJ0Jc+XVAdDgeo+B MlfQ== 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=WJ/lPuB9Vzy+z1eN8TyyT+PcfUk3bsrrkGnmnTEwDxA=; b=IqaU9jP/ptUaB2KNak6cHcc7VW22K88f9gW6MLSnjK4BkdnLv/5NZ19B/Rb2Sx5UlQ 4UzKdSkdKDvYSkEuRknEEzdW8lAyuHYkUPLX6iq1MliXgWb5+Wsv7HSRTRGVT1/DgK4j ukj54zP5yYVyf2aT+aW5M0+WJKLmhSd6W84PvU8yPuxQFeJIdRCEzltvDRXr0y6vX0Fc el+jjOnJNGRGNY1v07EqW1sgndlaX1pos/I+muSA9DGxvV2FDicZnpg5Mv9CIwHDGBvI IwEaNUuEcPZ25fbdNZL+B/xM+z/m1ZAsPUa70KfPAA36qWarjV26R6is7K/w7ncDTPSZ b4rA== X-Gm-Message-State: AJcUukfyStJph4li8iwJQkidaDKjdA9nDxIYHsaBi/r6Q8mCUMheChaB dGQiDuMQLFdajFz9mDUOcixIqroj X-Google-Smtp-Source: ALg8bN69DKnPJl2F9VV6qrxF1dQ0c/N7yye0k59CVdI+h6wLAygRxWQd4RSABYKev3a1Qzr7SCmDrQ== X-Received: by 2002:a17:902:1105:: with SMTP id d5mr5365858pla.47.1548316010994; Wed, 23 Jan 2019 23:46:50 -0800 (PST) Received: from gtx740.flets-east.jp ([2409:11:321:2100:c5e5:17d6:d698:81bb]) by smtp.gmail.com with ESMTPSA id i193sm73264227pgc.22.2019.01.23.23.46.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Jan 2019 23:46:50 -0800 (PST) From: Masashi Honma To: hostap@lists.infradead.org Subject: [PATCH 04/50] tests: Use python3 compatible range operation Date: Thu, 24 Jan 2019 16:45:44 +0900 Message-Id: <20190124074630.4192-5-masashi.honma@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190124074630.4192-1-masashi.honma@gmail.com> References: <20190124074630.4192-1-masashi.honma@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190123_234652_450140_72605B04 X-CRM114-Status: GOOD ( 11.01 ) 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 http://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:62b 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.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_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 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: Masashi Honma MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch is made by using 2to3 command. $ find . -name *.py | xargs 2to3 -f xrange -w -n Signed-off-by: Masashi Honma --- tests/hwsim/hwsim_utils.py | 6 +++--- tests/hwsim/rfkill.py | 4 ++-- tests/hwsim/test_wmediumd.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/hwsim/hwsim_utils.py b/tests/hwsim/hwsim_utils.py index 8ad08fcd5..cf49b13b1 100644 --- a/tests/hwsim/hwsim_utils.py +++ b/tests/hwsim/hwsim_utils.py @@ -83,7 +83,7 @@ def run_connectivity_test(dev1, dev2, tos, dev1group=False, dev2group=False, cmd = "DATA_TEST_TX ff:ff:ff:ff:ff:ff {} {}".format(addr1, tos) if send_len is not None: cmd += " len=" + str(send_len) - for i in xrange(broadcast_retry_c): + for i in range(broadcast_retry_c): try: if dev1group: dev1.group_request(cmd) @@ -135,7 +135,7 @@ def run_connectivity_test(dev1, dev2, tos, dev1group=False, dev2group=False, cmd = "DATA_TEST_TX ff:ff:ff:ff:ff:ff {} {}".format(addr2, tos) if send_len is not None: cmd += " len=" + str(send_len) - for i in xrange(broadcast_retry_c): + for i in range(broadcast_retry_c): try: if dev2group: dev2.group_request(cmd) @@ -221,7 +221,7 @@ def test_connectivity_p2p_sta(dev1, dev2, dscp=None, tos=None): def test_connectivity_sta(dev1, dev2, dscp=None, tos=None): test_connectivity(dev1, dev2, dscp, tos) -(PS_DISABLED, PS_ENABLED, PS_AUTO_POLL, PS_MANUAL_POLL) = range(4) +(PS_DISABLED, PS_ENABLED, PS_AUTO_POLL, PS_MANUAL_POLL) = list(range(4)) def set_powersave(dev, val): phy = dev.get_driver_status_field("phyname") diff --git a/tests/hwsim/rfkill.py b/tests/hwsim/rfkill.py index fa724ae50..a5e6f523a 100755 --- a/tests/hwsim/rfkill.py +++ b/tests/hwsim/rfkill.py @@ -21,12 +21,12 @@ import os TYPE_WWAN, TYPE_GPS, TYPE_FM, - TYPE_NFC) = range(9) + TYPE_NFC) = list(range(9)) (_OP_ADD, _OP_DEL, _OP_CHANGE, - _OP_CHANGE_ALL) = range(4) + _OP_CHANGE_ALL) = list(range(4)) _type_names = { TYPE_ALL: "all", diff --git a/tests/hwsim/test_wmediumd.py b/tests/hwsim/test_wmediumd.py index 26a7521e7..f17a02776 100644 --- a/tests/hwsim/test_wmediumd.py +++ b/tests/hwsim/test_wmediumd.py @@ -368,7 +368,7 @@ def test_wmediumd_path_rann(dev, apdev, params): raise Exception("No captured data found\n") lines = out.splitlines() prev = float(lines[len(lines) - 1]) - for i in reversed(range(1, len(lines) - 1)): + for i in reversed(list(range(1, len(lines) - 1))): now = float(lines[i]) if prev - now < 1.0 or 3.0 < prev - now: raise Exception("RANN interval " + str(prev - now) +