Skip to contentSkip to conversation

auto-t: speed up testHiddenNetworks

PATCH In review James Prestwood 2 participants 3 messages Oct 6, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 auto-t: speed up testHiddenNetworks

The CI was sometimes taking ~10-15 minutes to run just this test. This is likely due to the test having 7 radios and which is a lot of beacons/probes to process.

Disabling the unused hostapd instances drops the runtime down to about 1 minute.

---
 .../connect_after_hidden_connect_test.py          | 12 +++++++++++-
 autotests/testHiddenNetworks/exceptions_test.py   | 11 +++++++++++
 autotests/testHiddenNetworks/open_network_test.py | 14 ++++++++++++++
 autotests/testHiddenNetworks/wpa_network_test.py  | 15 +++++++++++++++
 4 files changed, 51 insertions(+), 1 deletion(-)
autotests/testHiddenNetworks/connect_after_hidden_connect_test.py +11 -1
index cc36771c..ead532a1 100644
@@ -7,6 +7,7 @@ sys.path.append('../util')
 import iwd
 from iwd import IWD
 from iwd import PSKAgent
+from hostapd import HostapdCLI
 import testutil
 import time
 
@@ -67,11 +68,20 @@ class TestConnectionAfterHiddenNetwork(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        pass
+        cls.disabled = [HostapdCLI('ssidHiddenOpen.conf'),
+                        HostapdCLI('ssidHiddenWPA.conf'),
+                        HostapdCLI('ssidOverlap1.conf'),
+                        HostapdCLI('ssidOverlap2.conf')]
+
+        for hapd in cls.disabled:
+            hapd.disable()
 
     @classmethod
     def tearDownClass(cls):
         IWD.clear_storage()
 
+        for hapd in cls.disabled:
+            hapd.reload()
+
 if __name__ == '__main__':
     unittest.main(exit=True)
autotests/testHiddenNetworks/exceptions_test.py +11 -0
index 1c4722a6..55e3c603 100644
@@ -8,6 +8,7 @@ import iwd
 import validation
 from validation import TestHiddenNetworks
 from iwd import IWD
+from hostapd import HostapdCLI
 
 class TestWpaNetwork(unittest.TestCase):
     '''
@@ -34,9 +35,19 @@ class TestWpaNetwork(unittest.TestCase):
     def setUpClass(cls):
         IWD.copy_to_storage('ssidAlreadyKnown.open')
 
+        cls.disabled = [HostapdCLI('ssidHiddenOpen.conf'),
+                        HostapdCLI('ssidHiddenWPA.conf'),
+                        HostapdCLI('ssidSomeHidden.conf')]
+
+        for hapd in cls.disabled:
+            hapd.disable()
+
     @classmethod
     def tearDownClass(cls):
         IWD.clear_storage()
 
+        for hapd in cls.disabled:
+            hapd.reload()
+
 if __name__ == '__main__':
     unittest.main(exit=True)
autotests/testHiddenNetworks/open_network_test.py +14 -0
index 8645fdad..e306e8a4 100644
@@ -8,6 +8,7 @@ import iwd
 import validation
 from validation import TestHiddenNetworks
 from iwd import IWD
+from hostapd import HostapdCLI
 
 class TestOpenNetwork(unittest.TestCase):
     '''
@@ -24,9 +25,22 @@ class TestOpenNetwork(unittest.TestCase):
         tca.validate('ssidHiddenOpen', False)
         tca.validate('ssidHiddenOpen', True)
 
+    @classmethod
+    def setUpClass(cls):
+        cls.disabled = [HostapdCLI('ssidHiddenWPA.conf'),
+                        HostapdCLI('ssidOpen.conf'),
+                        HostapdCLI('ssidOverlap1.conf'),
+                        HostapdCLI('ssidOverlap2.conf'),
+                        HostapdCLI('ssidSomeHidden.conf')]
+        for hapd in cls.disabled:
+            hapd.disable()
+
     @classmethod
     def tearDownClass(cls):
         IWD.clear_storage()
 
+        for hapd in cls.disabled:
+            hapd.reload()
+
 if __name__ == '__main__':
     unittest.main(exit=True)
autotests/testHiddenNetworks/wpa_network_test.py +15 -0
index a65fe1af..21045539 100644
@@ -8,6 +8,7 @@ import iwd
 import validation
 from validation import TestHiddenNetworks
 from iwd import IWD
+from hostapd import HostapdCLI
 
 class TestWpaNetwork(unittest.TestCase):
     '''
@@ -25,9 +26,23 @@ class TestWpaNetwork(unittest.TestCase):
         tca.validate('ssidHiddenWPA', False, None, True)
         tca.validate('ssidHiddenWPA', True, None, True)
 
+    @classmethod
+    def setUpClass(cls):
+        cls.disabled = [HostapdCLI('ssidHiddenOpen.conf'),
+                        HostapdCLI('ssidOpen.conf'),
+                        HostapdCLI('ssidOverlap1.conf'),
+                        HostapdCLI('ssidOverlap2.conf'),
+                        HostapdCLI('ssidSomeHidden.conf')]
+
+        for hapd in cls.disabled:
+            hapd.disable()
+
     @classmethod
     def tearDownClass(cls):
         IWD.clear_storage()
 
+        for hapd in cls.disabled:
+            hapd.reload()
+
 if __name__ == '__main__':
     unittest.main(exit=True)
Signature · 1 line
2.34.3
#1 lore raw

PATCH 2/2 auto-t: speed up testScan

This test was taking about 5 minutes to run, specifically the requested scan test. One slight optimization is to remove the duplicate hidden network, since there is no need for two. In addition the requested scan test was changed so it does not periodic scan and only issues a dbus scan.

---
 autotests/testScan/hw.conf                | 9 ++++-----
 autotests/testScan/periodic_scan_test.py  | 4 ++--
 autotests/testScan/requested_scan_test.py | 6 ------
 autotests/testScan/ssid_hidden_1.conf     | 4 ----
 autotests/testScan/ssid_hidden_1.open     | 3 ---
 5 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 autotests/testScan/ssid_hidden_1.conf
 delete mode 100644 autotests/testScan/ssid_hidden_1.open
autotests/testScan/hw.conf +4 -5
index 660c874e..54ae50c6 100644
@@ -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
autotests/testScan/periodic_scan_test.py +2 -2
index 77dac373..eb53b312 100644
@@ -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):
autotests/testScan/requested_scan_test.py +0 -6
index 26e44ddd..021f64ed 100644
@@ -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()
 
autotests/testScan/ssid_hidden_1.conf deleted +0 -4
deleted file mode 100644
index cc11803f..00000000
@@ -1,4 +0,0 @@
-ssid=ssid_hidden_1
-hw_mode=g
-channel=1
-ignore_broadcast_ssid=1
autotests/testScan/ssid_hidden_1.open deleted +0 -3
deleted file mode 100644
index 28622594..00000000
@@ -1,3 +0,0 @@
-[Settings]
-AutoConnect=false
-Hidden=true
Signature · 1 line
2.34.3
#2 lore raw
In reply to James Prestwood

Hi James,

Quoted 4 lines · James Prestwood

The CI was sometimes taking ~10-15 minutes to run just this test. This is likely due to the test having 7 radios and which is a lot of beacons/probes to process.

Quoted 8 lines

Disabling the unused hostapd instances drops the runtime down to about 1 minute.

---
  .../connect_after_hidden_connect_test.py          | 12 +++++++++++-
  autotests/testHiddenNetworks/exceptions_test.py   | 11 +++++++++++
  autotests/testHiddenNetworks/open_network_test.py | 14 ++++++++++++++
  autotests/testHiddenNetworks/wpa_network_test.py  | 15 +++++++++++++++
  4 files changed, 51 insertions(+), 1 deletion(-)

Both applied, thanks.

Regards,
-Denis