From patchwork Thu Nov 27 15:13:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 415549 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3890B1401AB for ; Fri, 28 Nov 2014 02:14:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 8C06A9C1FB; Thu, 27 Nov 2014 10:14:24 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UDtuDUTdxin3; Thu, 27 Nov 2014 10:14:24 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id F13909D2BD; Thu, 27 Nov 2014 10:14:16 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 7D7769D2BD for ; Thu, 27 Nov 2014 10:14:15 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ad6fR+5LkgOQ for ; Thu, 27 Nov 2014 10:14:08 -0500 (EST) Received: from sipsolutions.net (s3.sipsolutions.net [5.9.151.49]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client did not present a certificate) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id 859989C1FB for ; Thu, 27 Nov 2014 10:14:08 -0500 (EST) Received: by sipsolutions.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.84) (envelope-from ) id 1Xu0lg-0001Jd-HB; Thu, 27 Nov 2014 16:14:04 +0100 From: Johannes Berg To: hostap@lists.shmoo.com Subject: [PATCH] hwsim tests: use tshark -Y instead of tshark -R Date: Thu, 27 Nov 2014 16:13:57 +0100 Message-Id: <1417101237-26014-1-git-send-email-johannes@sipsolutions.net> X-Mailer: git-send-email 2.1.1 Cc: Johannes Berg X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.11 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com From: Johannes Berg Newer versions of tshark don't like the -R (read filter) argument for filtering and just show a deprecation warning. Use -Y (display filter) instead, which hopefully also works on older versions. Signed-off-by: Johannes Berg --- tests/hwsim/test_cfg80211.py | 2 +- tests/hwsim/test_p2p_channel.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/hwsim/test_cfg80211.py b/tests/hwsim/test_cfg80211.py index 779c4f1cb48e..cc24b93c9f53 100644 --- a/tests/hwsim/test_cfg80211.py +++ b/tests/hwsim/test_cfg80211.py @@ -85,7 +85,7 @@ def test_cfg80211_tx_frame(dev, apdev, params): try: arg = [ "tshark", "-r", os.path.join(params['logdir'], "hwsim0.pcapng"), - "-R", "wlan.fc.type_subtype == 13", + "-Y", "wlan.fc.type_subtype == 13", "-Tfields", "-e", "radiotap.channel.freq" ] cmd = subprocess.Popen(arg, stdout=subprocess.PIPE, stderr=open('/dev/null', 'w')) diff --git a/tests/hwsim/test_p2p_channel.py b/tests/hwsim/test_p2p_channel.py index 02c8fc2ab476..40456cbe4837 100644 --- a/tests/hwsim/test_p2p_channel.py +++ b/tests/hwsim/test_p2p_channel.py @@ -120,7 +120,7 @@ def test_p2p_channel_random_social_with_op_class_change(dev, apdev, params): try: arg = [ "tshark", "-r", os.path.join(params['logdir'], "hwsim0.pcapng"), - "-R", "wifi_p2p.public_action.subtype == 0", + "-Y", "wifi_p2p.public_action.subtype == 0", "-V" ] cmd = subprocess.Popen(arg, stdout=subprocess.PIPE, stderr=open('/dev/null', 'w'))