]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
tests: Make dbus_p2p_group_idle_timeout more robust
authorJouni Malinen <j@w1.fi>
Sun, 22 Nov 2015 19:28:49 +0000 (21:28 +0200)
committerJouni Malinen <j@w1.fi>
Sun, 22 Nov 2015 19:28:49 +0000 (21:28 +0200)
This test case was failing if a PropertiesChanged signal for P2P peer
gets delivered from a previous test case. Avoid that by waiting for the
new group to be formed before processing any PropertiesChanged signals.

This failure was triggered by the following test case sequence:
dbus_p2p_two_groups dbus_p2p_group_idle_timeout

Signed-off-by: Jouni Malinen <j@w1.fi>
tests/hwsim/test_dbus.py

index 32d2703536535f67bb5cde4aec17329917f12dc3..a85c33c8fe5c216166ba271d8627c6278b879452 100644 (file)
@@ -4411,6 +4411,7 @@ def _test_dbus_p2p_group_idle_timeout(dev, apdev):
         def __init__(self, bus):
             TestDbus.__init__(self, bus)
             self.done = False
+            self.group_started = False
             self.peer_group_added = False
             self.peer_group_removed = False
 
@@ -4453,6 +4454,7 @@ def _test_dbus_p2p_group_idle_timeout(dev, apdev):
 
         def groupStarted(self, properties):
             logger.debug("groupStarted: " + str(properties))
+            self.group_started = True
             g_if_obj = bus.get_object(WPAS_DBUS_SERVICE,
                                       properties['interface_object'])
             dev1 = WpaSupplicant('wlan1', '/tmp/wpas-wlan1')
@@ -4473,6 +4475,8 @@ def _test_dbus_p2p_group_idle_timeout(dev, apdev):
             logger.debug("propertiesChanged: interface_name=%s changed_properties=%s invalidated_properties=%s" % (interface_name, str(changed_properties), str(invalidated_properties)))
             if interface_name != WPAS_DBUS_P2P_PEER:
                 return
+            if not self.group_started:
+                return
             if "Groups" not in changed_properties:
                 return
             if len(changed_properties["Groups"]) > 0: