mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2024-12-22 21:22:37 +01:00
d232edde72
Many tests waited on the network object 'connected' property after issuing a Connect command. This is not correct as 'connected' is set quite early in the connection process. The correct way of doing this is waiting for the device state to change to connected. This common code was replaced, hopefully putting to rest any random failures that happen occasionally.
69 lines
2.1 KiB
Python
69 lines
2.1 KiB
Python
#!/usr/bin/python3
|
|
|
|
import unittest
|
|
import sys
|
|
|
|
sys.path.append('../util')
|
|
import iwd
|
|
from iwd import IWD
|
|
from iwd import PSKAgent
|
|
from iwd import NetworkType
|
|
|
|
class TestConnectAutoConnect(unittest.TestCase):
|
|
|
|
def check_connect(self, wd, device, ssid, throws):
|
|
ordered_network = device.get_ordered_network(ssid, scan_if_needed=True)
|
|
|
|
condition = 'not obj.connected'
|
|
wd.wait_for_object_condition(ordered_network.network_object, condition)
|
|
|
|
if not throws is None:
|
|
with self.assertRaises(throws):
|
|
ordered_network.network_object.connect()
|
|
return
|
|
else:
|
|
ordered_network.network_object.connect()
|
|
|
|
condition = 'obj.state == DeviceState.connected'
|
|
wd.wait_for_object_condition(device, condition)
|
|
|
|
def check_autoconnect(self, wd, device, ssid, throws):
|
|
if throws is None:
|
|
condition = 'obj.state == DeviceState.connected'
|
|
wd.wait_for_object_condition(device, condition)
|
|
|
|
condition = 'obj.connected_network is not None'
|
|
wd.wait_for_object_condition(device, condition)
|
|
|
|
ordered_network = device.get_ordered_network(ssid)
|
|
|
|
self.assertTrue(ordered_network.network_object.connected)
|
|
|
|
device.disconnect()
|
|
|
|
condition = 'obj.state == DeviceState.disconnected'
|
|
wd.wait_for_object_condition(device, condition)
|
|
|
|
def validate_connection(self, wd, ssid, autoconnect, throws = None,
|
|
use_agent = False):
|
|
if use_agent:
|
|
psk_agent = PSKAgent("secret123")
|
|
wd.register_psk_agent(psk_agent)
|
|
|
|
devices = wd.list_devices(1)
|
|
self.assertIsNotNone(devices)
|
|
device = devices[0]
|
|
|
|
if autoconnect:
|
|
self.check_autoconnect(wd, device, ssid, throws)
|
|
else:
|
|
self.check_connect(wd, device, ssid, throws)
|
|
|
|
if use_agent:
|
|
wd.unregister_psk_agent(psk_agent)
|
|
|
|
def validate(self, ssid, autoconnect, throws = None, use_agent = False):
|
|
wd = IWD(True)
|
|
|
|
self.validate_connection(wd, ssid, autoconnect, throws, use_agent)
|