From 084780f1cafdded58a63f38bf181b3a7f2ca9565 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 5 Sep 2015 22:29:00 +0300 Subject: [PATCH] tests: D-Bus GroupFormationFailure signal Signed-off-by: Jouni Malinen --- tests/hwsim/test_dbus.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/hwsim/test_dbus.py b/tests/hwsim/test_dbus.py index 273ed5031..dba899e9f 100644 --- a/tests/hwsim/test_dbus.py +++ b/tests/hwsim/test_dbus.py @@ -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():