From 137fd0509955060aeac62c5a17f02ae44307b496 Mon Sep 17 00:00:00 2001 From: Jonathan Afek Date: Thu, 23 Jun 2016 20:16:29 +0300 Subject: [PATCH] tests: Use cmd_execute() for iw station get command The hwsim tests used to execute shell commands in the tests using the subprocess python module. Use the cmd_execute() general function for executing "iw ... station get" commands so that this would also work on remote setups. Signed-off-by: Jonathan Afek --- tests/hwsim/test_ap_pmf.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/hwsim/test_ap_pmf.py b/tests/hwsim/test_ap_pmf.py index c9d740313..28d548952 100644 --- a/tests/hwsim/test_ap_pmf.py +++ b/tests/hwsim/test_ap_pmf.py @@ -5,7 +5,6 @@ # See README for more details. import time -import subprocess import logging logger = logging.getLogger() @@ -413,9 +412,8 @@ def _test_ap_pmf_toggle(dev, apdev): sta = hapd.get_sta(addr) if '[MFP]' in sta['flags']: raise Exception("MFP flag unexpectedly present for STA") - cmd = subprocess.Popen(['iw', 'dev', apdev[0]['ifname'], 'station', 'get', - addr], stdout=subprocess.PIPE) - (data,err) = cmd.communicate() + err, data = hapd.cmd_execute(['iw', 'dev', apdev[0]['ifname'], 'station', + 'get', addr]) if "yes" in [l for l in data.splitlines() if "MFP" in l][0]: raise Exception("Kernel STA entry had MFP enabled") @@ -426,9 +424,8 @@ def _test_ap_pmf_toggle(dev, apdev): sta = hapd.get_sta(addr) if '[MFP]' not in sta['flags']: raise Exception("MFP flag not present for STA") - cmd = subprocess.Popen(['iw', 'dev', apdev[0]['ifname'], 'station', 'get', - addr], stdout=subprocess.PIPE) - (data,err) = cmd.communicate() + err, data = hapd.cmd_execute(['iw', 'dev', apdev[0]['ifname'], 'station', + 'get', addr]) if "yes" not in [l for l in data.splitlines() if "MFP" in l][0]: raise Exception("Kernel STA entry did not have MFP enabled")