DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

test: dbus: Wait for connection before disconnect (again)

Browse source 
The same thing as we did previously in dbus_p2p_autogo_pbc
can evidently also happen in dbus_p2p_autogo.

The test here wants to connect and then disconnect again,
but it's driven only by the GO side, so the client may end
up (with UML time-travel) not fully connecting, and then
it all fails. Wait for the client to have connected first.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2024-01-30 17:21:29 +01:00 committed by Jouni Malinen
parent 13837a031a
commit 6777ff621a
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/hwsim/test_dbus.py
View file

@ -3684,6 +3684,7 @@ def test_dbus_p2p_autogo(dev, apdev):
self.exceptions = False self.exceptions = False
self.deauthorized = False self.deauthorized = False
self.done = False self.done = False
self.dev1 = WpaSupplicant('wlan1', '/tmp/wpas-wlan1')
def __enter__(self): def __enter__(self):
gobject.timeout_add(1, self.run_test) gobject.timeout_add(1, self.run_test)
@ -3737,8 +3738,7 @@ def test_dbus_p2p_autogo(dev, apdev):
WPAS_DBUS_IFACE_P2PDEVICE) WPAS_DBUS_IFACE_P2PDEVICE)
group_p2p.Disconnect() group_p2p.Disconnect()
else: else:
dev1 = WpaSupplicant('wlan1', '/tmp/wpas-wlan1') self.dev1.global_request("P2P_CONNECT " + addr0 + " 12345670 join")
dev1.global_request("P2P_CONNECT " + addr0 + " 12345670 join")
def groupFinished(self, properties): def groupFinished(self, properties):
logger.debug("groupFinished: " + str(properties)) logger.debug("groupFinished: " + str(properties))
@ -3759,6 +3759,7 @@ def test_dbus_p2p_autogo(dev, apdev):
def persistentGroupRemoved(self, path): def persistentGroupRemoved(self, path):
logger.debug("persistentGroupRemoved: %s" % path) logger.debug("persistentGroupRemoved: %s" % path)
self.done = True self.done = True
self.dev1 = None
self.loop.quit() self.loop.quit()
def deviceFound(self, path): def deviceFound(self, path):
@ -3902,6 +3903,10 @@ def test_dbus_p2p_autogo(dev, apdev):
p2p.RemoveClient({'peer': self.peer_path}) p2p.RemoveClient({'peer': self.peer_path})
self.waiting_end = True self.waiting_end = True
# wait for client to be fully connected
self.dev1.wait_connected()
# so we can cleanly disconnect it now
group_p2p = dbus.Interface(self.g_if_obj, group_p2p = dbus.Interface(self.g_if_obj,
WPAS_DBUS_IFACE_P2PDEVICE) WPAS_DBUS_IFACE_P2PDEVICE)
group_p2p.Disconnect() group_p2p.Disconnect()