From a548c37bad6c038156952efb7a59bdb1b7615fca 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 reg set 00 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 reg set 00" so that this would also work on remote setups. Signed-off-by: Jonathan Afek --- tests/hwsim/test_ap_acs.py | 7 +++---- tests/hwsim/test_ap_params.py | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/hwsim/test_ap_acs.py b/tests/hwsim/test_ap_acs.py index 0f9bc8caa..fbfecb770 100644 --- a/tests/hwsim/test_ap_acs.py +++ b/tests/hwsim/test_ap_acs.py @@ -6,7 +6,6 @@ import logging logger = logging.getLogger() -import subprocess import time import hostapd @@ -144,7 +143,7 @@ def test_ap_acs_5ghz(dev, apdev): dev[0].request("DISCONNECT") if hapd: hapd.request("DISABLE") - subprocess.call(['iw', 'reg', 'set', '00']) + hostapd.cmd_execute(apdev[0], ['iw', 'reg', 'set', '00']) dev[0].flush_scan_cache() def test_ap_acs_5ghz_40mhz(dev, apdev): @@ -173,7 +172,7 @@ def test_ap_acs_5ghz_40mhz(dev, apdev): dev[0].request("DISCONNECT") if hapd: hapd.request("DISABLE") - subprocess.call(['iw', 'reg', 'set', '00']) + hostapd.cmd_execute(apdev[0], ['iw', 'reg', 'set', '00']) dev[0].flush_scan_cache() def test_ap_acs_vht(dev, apdev): @@ -204,7 +203,7 @@ def test_ap_acs_vht(dev, apdev): dev[0].request("DISCONNECT") if hapd: hapd.request("DISABLE") - subprocess.call(['iw', 'reg', 'set', '00']) + hostapd.cmd_execute(apdev[0], ['iw', 'reg', 'set', '00']) dev[0].flush_scan_cache() def test_ap_acs_bias(dev, apdev): diff --git a/tests/hwsim/test_ap_params.py b/tests/hwsim/test_ap_params.py index bfba5f8df..7fb58a5ad 100644 --- a/tests/hwsim/test_ap_params.py +++ b/tests/hwsim/test_ap_params.py @@ -112,7 +112,7 @@ def test_ap_country(dev, apdev): dev[0].request("DISCONNECT") if hapd: hapd.request("DISABLE") - subprocess.call(['iw', 'reg', 'set', '00']) + hostapd.cmd_execute(apdev[0], ['iw', 'reg', 'set', '00']) dev[0].flush_scan_cache() def test_ap_acl_accept(dev, apdev): @@ -247,7 +247,7 @@ def test_ap_spectrum_management_required(dev, apdev): dev[0].request("DISCONNECT") if hapd: hapd.request("DISABLE") - subprocess.call(['iw', 'reg', 'set', '00']) + hostapd.cmd_execute(apdev[0], ['iw', 'reg', 'set', '00']) dev[0].flush_scan_cache() def test_ap_max_listen_interval(dev, apdev):