diff --git a/autotests/testScan/hw.conf b/autotests/testScan/hw.conf index 660c874e..54ae50c6 100644 --- a/autotests/testScan/hw.conf +++ b/autotests/testScan/hw.conf @@ -1,10 +1,9 @@ [SETUP] -num_radios=6 +num_radios=5 start_iwd=0 [HOSTAPD] rad0=ssid_hidden_0.conf -rad1=ssid_hidden_1.conf -rad2=ssid_open.conf -rad3=ssid_8021x.conf -rad4=ssid_psk.conf +rad1=ssid_open.conf +rad2=ssid_8021x.conf +rad3=ssid_psk.conf diff --git a/autotests/testScan/periodic_scan_test.py b/autotests/testScan/periodic_scan_test.py index 77dac373..eb53b312 100644 --- a/autotests/testScan/periodic_scan_test.py +++ b/autotests/testScan/periodic_scan_test.py @@ -12,7 +12,7 @@ class Test(unittest.TestCase): 'ssid_open': False, 'ssid_psk': False, 'ssid_8021x': False, - 'ssid_hidden_1': False, + 'ssid_hidden_0': False, } def set_network(self, ssid): @@ -58,7 +58,7 @@ class Test(unittest.TestCase): @classmethod def setUpClass(cls): - IWD.copy_to_storage('ssid_hidden_1.open') + IWD.copy_to_storage('ssid_hidden_0.open') @classmethod def tearDownClass(cls): diff --git a/autotests/testScan/requested_scan_test.py b/autotests/testScan/requested_scan_test.py index 26e44ddd..021f64ed 100644 --- a/autotests/testScan/requested_scan_test.py +++ b/autotests/testScan/requested_scan_test.py @@ -30,12 +30,6 @@ class Test(unittest.TestCase): devices = wd.list_devices(1) self.assertIsNotNone(devices) device = devices[0] - device.autoconnect = True - - condition = 'obj.scanning' - wd.wait_for_object_condition(device, condition) - condition = 'not obj.scanning' - wd.wait_for_object_condition(device, condition) device.scan() diff --git a/autotests/testScan/ssid_hidden_1.conf b/autotests/testScan/ssid_hidden_1.conf deleted file mode 100644 index cc11803f..00000000 --- a/autotests/testScan/ssid_hidden_1.conf +++ /dev/null @@ -1,4 +0,0 @@ -ssid=ssid_hidden_1 -hw_mode=g -channel=1 -ignore_broadcast_ssid=1 diff --git a/autotests/testScan/ssid_hidden_1.open b/autotests/testScan/ssid_hidden_1.open deleted file mode 100644 index 28622594..00000000 --- a/autotests/testScan/ssid_hidden_1.open +++ /dev/null @@ -1,3 +0,0 @@ -[Settings] -AutoConnect=false -Hidden=true