DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: Support older tshark versions

Browse source 
The -Y command line argument may need to be replaced with -R when an
older tshark version is used.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-12-25 15:51:10 +02:00
parent 8c6f6ac100
commit 84512f8c9b
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/hwsim/test_cfg80211.py
View file

@ -95,7 +95,16 @@ def test_cfg80211_tx_frame(dev, apdev, params):
pass
if cmd:
freq = cmd.stdout.read().splitlines()
(out,err) = cmd.communicate()
res = cmd.wait()
if res == 1:
arg[3] = '-R'
cmd = subprocess.Popen(arg, stdout=subprocess.PIPE,
stderr=open('/dev/null', 'w'))
(out,err) = cmd.communicate()
res = cmd.wait()
freq = out.splitlines()
if len(freq) != 2:
raise Exception("Unexpected number of Action frames (%d)" % len(freq))
if freq[0] != "2422":

11
tests/hwsim/test_p2p_channel.py
View file

@ -144,8 +144,17 @@ def test_p2p_channel_random_social_with_op_class_change(dev, apdev, params):
pass
if cmd:
(out,err) = cmd.communicate()
res = cmd.wait()
if res == 1:
arg[3] = '-R'
cmd = subprocess.Popen(arg, stdout=subprocess.PIPE,
stderr=open('/dev/null', 'w'))
(out,err) = cmd.communicate()
res = cmd.wait()
last = None
for l in cmd.stdout.read().splitlines():
for l in out.splitlines():
if "Operating Channel:" not in l:
continue
last = l