From: James Prestwood <prestwoj@gmail.com>
To: iwd@lists.linux.dev
Cc: James Prestwood <prestwoj@gmail.com>
Subject: [PATCH 1/2] auto-t: speed up testHiddenNetworks
Date: Thu, 6 Oct 2022 10:40:39 -0700 [thread overview]
Message-ID: <20221006174040.823577-1-prestwoj@gmail.com> (raw)
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(-)
diff --git a/autotests/testHiddenNetworks/connect_after_hidden_connect_test.py b/autotests/testHiddenNetworks/connect_after_hidden_connect_test.py
index cc36771c..ead532a1 100644
--- a/autotests/testHiddenNetworks/connect_after_hidden_connect_test.py
+++ b/autotests/testHiddenNetworks/connect_after_hidden_connect_test.py
@@ -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)
diff --git a/autotests/testHiddenNetworks/exceptions_test.py b/autotests/testHiddenNetworks/exceptions_test.py
index 1c4722a6..55e3c603 100644
--- a/autotests/testHiddenNetworks/exceptions_test.py
+++ b/autotests/testHiddenNetworks/exceptions_test.py
@@ -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)
diff --git a/autotests/testHiddenNetworks/open_network_test.py b/autotests/testHiddenNetworks/open_network_test.py
index 8645fdad..e306e8a4 100644
--- a/autotests/testHiddenNetworks/open_network_test.py
+++ b/autotests/testHiddenNetworks/open_network_test.py
@@ -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)
diff --git a/autotests/testHiddenNetworks/wpa_network_test.py b/autotests/testHiddenNetworks/wpa_network_test.py
index a65fe1af..21045539 100644
--- a/autotests/testHiddenNetworks/wpa_network_test.py
+++ b/autotests/testHiddenNetworks/wpa_network_test.py
@@ -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)
--
2.34.3
next reply other threads:[~2022-10-06 17:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-06 17:40 James Prestwood [this message]
2022-10-06 17:40 ` [PATCH 2/2] auto-t: speed up testScan James Prestwood
2022-10-06 19:42 ` [PATCH 1/2] auto-t: speed up testHiddenNetworks Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221006174040.823577-1-prestwoj@gmail.com \
--to=prestwoj@gmail.com \
--cc=iwd@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox