tests: D-Bus GroupFormationFailure signal
authorJouni Malinen <j@w1.fi>
Sat, 5 Sep 2015 19:29:00 +0000 (22:29 +0300)
committerJouni Malinen <j@w1.fi>
Sat, 5 Sep 2015 20:01:20 +0000 (23:01 +0300)
Signed-off-by: Jouni Malinen <j@w1.fi>
tests/hwsim/test_dbus.py

index 273ed50..dba899e 100644 (file)
@@ -4403,7 +4403,8 @@ def test_dbus_p2p_wps_failure(dev, apdev):
     class TestDbusP2p(TestDbus):
         def __init__(self, bus):
             TestDbus.__init__(self, bus)
-            self.done = False
+            self.wps_failed = False
+            self.formation_failure = False
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
@@ -4420,6 +4421,9 @@ def test_dbus_p2p_wps_failure(dev, apdev):
                             "GroupStarted")
             self.add_signal(self.wpsFailed, WPAS_DBUS_IFACE_P2PDEVICE,
                             "WpsFailed")
+            self.add_signal(self.groupFormationFailure,
+                            WPAS_DBUS_IFACE_P2PDEVICE,
+                            "GroupFormationFailure")
             self.loop.run()
             return self
 
@@ -4440,8 +4444,15 @@ def test_dbus_p2p_wps_failure(dev, apdev):
 
         def wpsFailed(self, name, args):
             logger.debug("wpsFailed - name=%s args=%s" % (name, str(args)))
-            self.done = True
-            self.loop.quit()
+            self.wps_failed = True
+            if self.formation_failure:
+                self.loop.quit()
+
+        def groupFormationFailure(self, reason):
+            logger.debug("groupFormationFailure - reason=%s" % reason)
+            self.formation_failure = True
+            if self.wps_failed:
+                self.loop.quit()
 
         def run_test(self, *args):
             logger.debug("run_test")
@@ -4453,7 +4464,7 @@ def test_dbus_p2p_wps_failure(dev, apdev):
             return False
 
         def success(self):
-            return self.done
+            return self.wps_failed and self.formation_failure
 
     with TestDbusP2p(bus) as t:
         if not t.success():