Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

auto-t: remove busy wait for eapol reauth

Browse Source 
Many tests force a reauth after the initial connection. When the tests
were written there was no way of ensuring the reauth completed except
waiting (IWD.wait()). Now we can wait for hostapd events in the tests,
which is faster and more reliable than busy waiting.
This commit is contained in:
James Prestwood 2020-07-08 10:48:01 -07:00 committed by Denis Kenzior
parent 38c8fe06a4
commit 0fdc3b3ed6
8 changed files with 23 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
autotests/testEAP-AKA/connection_test.py
View File

@ -15,13 +15,7 @@ from hostapd import hostapd_map
class Test(unittest.TestCase): class Test(unittest.TestCase):
def test_connection_success(self): def test_connection_success(self):
hostapd = None hostapd = HostapdCLI(config='ssidEAP-AKA.conf')
for hostapd_if in list(hostapd_map.values()):
hpd = HostapdCLI(hostapd_if)
if hpd.get_config_value('ssid') == 'ssidEAP-AKA':
hostapd = hpd
break
self.assertIsNotNone(hostapd) self.assertIsNotNone(hostapd)
@ -58,7 +52,8 @@ class Test(unittest.TestCase):
hostapd.eapol_reauth(device.address) hostapd.eapol_reauth(device.address)
wd.wait(10) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED')
hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS')
condition = 'obj.connected' condition = 'obj.connected'
wd.wait_for_object_condition(ordered_network.network_object, condition) wd.wait_for_object_condition(ordered_network.network_object, condition)

11
autotests/testEAP-PEAPv0-CryptoBinding/NoISK_test.py
View File

@ -16,13 +16,7 @@ from hostapd import hostapd_map
class Test(unittest.TestCase): class Test(unittest.TestCase):
def validate_connection(self, wd): def validate_connection(self, wd):
hostapd = None hostapd = HostapdCLI(config='ssidEAP-PEAPv0-NoISK.conf')
for hostapd_if in list(hostapd_map.values()):
hpd = HostapdCLI(hostapd_if)
if hpd.get_config_value('ssid') == 'ssidEAP-PEAPv0-NoISK':
hostapd = hpd
break
self.assertIsNotNone(hostapd) self.assertIsNotNone(hostapd)
@ -52,7 +46,8 @@ class Test(unittest.TestCase):
hostapd.eapol_reauth(device.address) hostapd.eapol_reauth(device.address)
wd.wait(10) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED')
hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS')
condition = 'obj.connected' condition = 'obj.connected'
wd.wait_for_object_condition(ordered_network.network_object, condition) wd.wait_for_object_condition(ordered_network.network_object, condition)

12
autotests/testEAP-PWD/connection_test.py
View File

@ -15,14 +15,7 @@ from hostapd import hostapd_map
class Test(unittest.TestCase): class Test(unittest.TestCase):
def validate_connection(self, wd): def validate_connection(self, wd):
hostapd = HostapdCLI(config='ssidEAP-PWD.conf')
hostapd = None
for hostapd_if in list(hostapd_map.values()):
hpd = HostapdCLI(hostapd_if)
if hpd.get_config_value('ssid') == 'ssidEAP-PWD':
hostapd = hpd
break
self.assertIsNotNone(hostapd) self.assertIsNotNone(hostapd)
@ -56,7 +49,8 @@ class Test(unittest.TestCase):
hostapd.eapol_reauth(device.address) hostapd.eapol_reauth(device.address)
wd.wait(10) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED')
hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS')
condition = 'obj.connected' condition = 'obj.connected'
wd.wait_for_object_condition(ordered_network.network_object, condition) wd.wait_for_object_condition(ordered_network.network_object, condition)

11
autotests/testEAP-SIM/connection_test.py
View File

@ -15,13 +15,7 @@ from hostapd import hostapd_map
class Test(unittest.TestCase): class Test(unittest.TestCase):
def test_connection_success(self): def test_connection_success(self):
hostapd = None hostapd = HostapdCLI(config='ssidEAP-SIM.conf')
for hostapd_if in list(hostapd_map.values()):
hpd = HostapdCLI(hostapd_if)
if hpd.get_config_value('ssid') == 'ssidEAP-SIM':
hostapd = hpd
break
auth = AuthCenter('/tmp/hlrauc.sock', '/tmp/sim.db') auth = AuthCenter('/tmp/hlrauc.sock', '/tmp/sim.db')
@ -56,7 +50,8 @@ class Test(unittest.TestCase):
hostapd.eapol_reauth(device.address) hostapd.eapol_reauth(device.address)
wd.wait(10) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED')
hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS')
condition = 'obj.connected' condition = 'obj.connected'
wd.wait_for_object_condition(ordered_network.network_object, condition) wd.wait_for_object_condition(ordered_network.network_object, condition)

11
autotests/testEAP-TTLS-CHAP/connection_test.py
View File

@ -16,13 +16,7 @@ from hostapd import hostapd_map
class Test(unittest.TestCase): class Test(unittest.TestCase):
def test_connection_success(self): def test_connection_success(self):
hostapd = None hostapd = HostapdCLI(config='ssidEAP-TTLS-CHAP.conf')
for hostapd_if in list(hostapd_map.values()):
hpd = HostapdCLI(hostapd_if)
if hpd.get_config_value('ssid') == 'ssidEAP-TTLS-CHAP':
hostapd = hpd
break
self.assertIsNotNone(hostapd) self.assertIsNotNone(hostapd)
@ -55,7 +49,8 @@ class Test(unittest.TestCase):
hostapd.eapol_reauth(device.address) hostapd.eapol_reauth(device.address)
wd.wait(10) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED')
hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS')
condition = 'obj.connected' condition = 'obj.connected'
wd.wait_for_object_condition(ordered_network.network_object, condition) wd.wait_for_object_condition(ordered_network.network_object, condition)

11
autotests/testEAP-TTLS-MSCHAP/connection_test.py
View File

@ -16,13 +16,7 @@ from hostapd import hostapd_map
class Test(unittest.TestCase): class Test(unittest.TestCase):
def test_connection_success(self): def test_connection_success(self):
hostapd = None hostapd = HostapdCLI(config='ssidEAP-TTLS-MSCHAP.conf')
for hostapd_if in hostapd_map.values():
hpd = HostapdCLI(hostapd_if)
if hpd.get_config_value('ssid') == 'ssidEAP-TTLS-MSCHAP':
hostapd = hpd
break
self.assertIsNotNone(hostapd) self.assertIsNotNone(hostapd)
@ -55,7 +49,8 @@ class Test(unittest.TestCase):
hostapd.eapol_reauth(device.address) hostapd.eapol_reauth(device.address)
wd.wait(10) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED')
hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS')
condition = 'obj.connected' condition = 'obj.connected'
wd.wait_for_object_condition(ordered_network.network_object, condition) wd.wait_for_object_condition(ordered_network.network_object, condition)

3
autotests/testEAP-TTLS-MSCHAPv2/connection_test.py
View File

@ -48,7 +48,8 @@ class Test(unittest.TestCase):
hostapd.eapol_reauth(device.address) hostapd.eapol_reauth(device.address)
wd.wait(10) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED')
hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS')
condition = 'obj.connected' condition = 'obj.connected'
wd.wait_for_object_condition(ordered_network.network_object, condition) wd.wait_for_object_condition(ordered_network.network_object, condition)

11
autotests/testEAP-TTLS-PAP/connection_test.py
View File

@ -16,13 +16,7 @@ from hostapd import hostapd_map
class Test(unittest.TestCase): class Test(unittest.TestCase):
def test_connection_success(self): def test_connection_success(self):
hostapd = None hostapd = HostapdCLI(config='ssidEAP-TTLS-PAP.conf')
for hostapd_if in list(hostapd_map.values()):
hpd = HostapdCLI(hostapd_if)
if hpd.get_config_value('ssid') == 'ssidEAP-TTLS-PAP':
hostapd = hpd
break
self.assertIsNotNone(hostapd) self.assertIsNotNone(hostapd)
@ -55,7 +49,8 @@ class Test(unittest.TestCase):
hostapd.eapol_reauth(device.address) hostapd.eapol_reauth(device.address)
wd.wait(10) hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED')
hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS')
condition = 'obj.connected' condition = 'obj.connected'
wd.wait_for_object_condition(ordered_network.network_object, condition) wd.wait_for_object_condition(ordered_network.network_object, condition)