From 50d7cdedaeeb65af33db55b6eea5146044769a44 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 17 Feb 2018 17:21:05 +0200 Subject: [PATCH] tests: Make dbus_p2p_discovery more robust Ignore any unexpected deviceLost event before the peer devices has been discovered. This works around issues where the previous test case terminates before the D-Bus events have been fully delivered. This could happen, e.g., when running dbus_p2p_discovery twice in a row. Signed-off-by: Jouni Malinen --- tests/hwsim/test_dbus.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/hwsim/test_dbus.py b/tests/hwsim/test_dbus.py index 03249cf03..280148c33 100644 --- a/tests/hwsim/test_dbus.py +++ b/tests/hwsim/test_dbus.py @@ -3060,6 +3060,12 @@ def test_dbus_p2p_discovery(dev, apdev): def deviceLost(self, path): logger.debug("deviceLost: path=%s" % path) + if not self.found or not self.found2: + # This may happen if a previous test case ended up scheduling + # deviceLost event and that event did not get delivered before + # starting the next test execution. + logger.debug("Ignore deviceLost before the deviceFound events") + return self.lost = True try: p2p.RejectPeer(path)