From patchwork Thu Mar 2 03:48:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 734458 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 3vYdcX2hSNz9s7f for ; Thu, 2 Mar 2017 14:50:04 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iEoA1sO3"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SHuw0mmv"; dkim-atps=neutral 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=FFvZauPnjYAJ9+snXtnPaVHWcuTrEDsHInCr3H2V4Rg=; b=iEoA1sO3JGJ0Z/yEy/ahDK/WrX AXg4clh5AUtVKXRoAiv1HQZ4kSmN1wDcuJn101+g2+WVra3RrpowRKT7iQZexxyKhsRWrmjEP25MA /4RsZAX5DrSR1rIICpum6TIjFu40FYVuGkYc2hxY6jS0+zxb9sh4b4F+SPIKS4d/rRaIK3c1kQ5Wc 99kcff514sBF+ONVn6bWx8VXqt1JcY3WCAOG4wMgEXsT6YSZYv05lmvBvgxO3wqp3q4KsFy/NqrmP Y50i4JG6rdS7phSE+P08HgqNQq7oWadX4ie+Dx9yoZ8zZ5XtP5LiG5/j7VaOkgvC/VDPO5OqvIHic GBH3uYiA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cjHkY-0002uX-BW; Thu, 02 Mar 2017 03:49:54 +0000 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cjHjM-0002hy-CZ for hostap@lists.infradead.org; Thu, 02 Mar 2017 03:48:42 +0000 Received: by mail-pg0-x243.google.com with SMTP id 25so7832078pgy.3 for ; Wed, 01 Mar 2017 19:48:18 -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=xrCPndH/3HH5XWOr+5swGFgUkahLgT4usHgL9KaZ33Q=; b=SHuw0mmvJDPPHSpInRkhxj8ilonEWR1wbGdZdfuKhuKhx8KJ9CVyuygwVppyP86k8X maAKMsjNiGms2JaBPwgHdsy6jWErZ5dd9r7/qfBd7Boqy8gRu/A9YwU160D67vfYvYs8 EDLpFkEyTqcK+X9yeQgcO42x7eruJaCTkDvx2nKvPnqK16a9DgX8LNDMFkvVEIRFqNcy iUbYBhgukRCu8esnHV81gD8VIgryeF7euwp2Hxug6aNqDZqVt+BdpQqVtXK2+ZK/KDHq oeIm0pQY0rNTBvS70qc0LwYN2odHfzGN+zd7zUc83NTeLwxYAELRR61Yc8fHmvYGVDeA J+7A== 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=xrCPndH/3HH5XWOr+5swGFgUkahLgT4usHgL9KaZ33Q=; b=pujHxF8YkwC7Encb0hjFc3nqxr9gLoHRHEDrZcIU1wCg/Yg2vpaA92aNi7hcDhAiM8 ZFLDr0yyhAhTVSVW+Qp46WuTjDntkOqQKMjIhPeaR53v+kBNHtbsDOF7tOcPBA8kxdjq Eh24yTKU5q8GZXaeCikBIVl/5JkLeoMNr/l8vkMU5ZZ0Q/BymCsvC1pY+liFzB/LQWi2 mpXoWAESD6PFz5wnKQrwvqweelAg7Vzd2JlYi7XQoglhgptb3HQOg8fTQ1BFxX2wuBOd cB5lpZJkIuI0/19RwCTtMHvcoWC/T9tRX6Fzwkg92e1FvlFr/N+SiVfhyYbmj36hitR/ 7LnQ== X-Gm-Message-State: AMke39nN6lKdzBpYoGFIJaIs95c6vr1/N1HHr8vCSvNJZ4bvpblytsrHD9SWqZZhqd9vJQ== X-Received: by 10.99.7.13 with SMTP id 13mr12710871pgh.121.1488426497955; Wed, 01 Mar 2017 19:48:17 -0800 (PST) Received: from localhost.localdomain (p6e104f.kngwnt01.ap.so-net.ne.jp. [218.110.16.79]) by smtp.gmail.com with ESMTPSA id b67sm13244464pfj.81.2017.03.01.19.48.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Mar 2017 19:48:17 -0800 (PST) From: Masashi Honma To: hostap@lists.infradead.org Subject: [PATCH v3 2/3] tests: Check wmediumd version Date: Thu, 2 Mar 2017 12:48:05 +0900 Message-Id: <1488426486-3965-2-git-send-email-masashi.honma@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488426486-3965-1-git-send-email-masashi.honma@gmail.com> References: <1488332457-23457-1-git-send-email-masashi.honma@gmail.com> <1488426486-3965-1-git-send-email-masashi.honma@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170301_194840_453911_A797986A X-CRM114-Status: UNSURE ( 7.53 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -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) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c05:0:0:0:243 listed in] [list.dnswl.org] 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: j@w1.fi, Masashi Honma , me@bobcopeland.com MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Some wmediumd tests requires new wmediumd features. Modified SNR table, location-based config and log levels. The wmediumd 0.2 does not have these features, so skip such a tests. Signed-off-by: Masashi Honma --- tests/hwsim/test_wmediumd.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/hwsim/test_wmediumd.py b/tests/hwsim/test_wmediumd.py index 9da54d3..a3e475b 100644 --- a/tests/hwsim/test_wmediumd.py +++ b/tests/hwsim/test_wmediumd.py @@ -11,6 +11,9 @@ from test_wpas_mesh import check_mesh_support, check_mesh_group_added from test_wpas_mesh import check_mesh_peer_connected, add_open_mesh_network from test_wpas_mesh import check_mesh_group_removed +class LocalVariables: + is_old_wmediumd = None + CFG = """ ifaces : { @@ -34,6 +37,26 @@ ifaces : }; """ +def check_wmediumd_version(): + if LocalVariables.is_old_wmediumd != None: + if LocalVariables.is_old_wmediumd: + raise HwsimSkip('wmediumd not available') + return + + try: + stdoutdata = subprocess.check_output(['wmediumd', '-V']) + except OSError, e: + if e.errno == errno.ENOENT: + LocalVariables.is_old_wmediumd = True + raise HwsimSkip('wmediumd not available') + raise + + if stdoutdata.find('wmediumd v0.2 ') > -1: + LocalVariables.is_old_wmediumd = True + raise HwsimSkip('wmediumd not available') + else: + LocalVariables.is_old_wmediumd = False + def output_wmediumd_log(p, params, data): log_file = open(os.path.abspath(os.path.join(params['logdir'], 'wmediumd.log')), 'a') @@ -93,6 +116,7 @@ def test_wmediumd_path_simple(dev, apdev, params): # | | # +-----X-----+ # This tests if 1 and 2 can communicate each other via 0. + check_wmediumd_version() fd, fn = tempfile.mkstemp() try: f = os.fdopen(fd, 'w')