test: dbus: Unregister timeout source at end of test

Using timeout_add registers the GSource with the default GMainContext.
This GMainContext will remain the same between tests, and the registered
sources will therefore not be destroyed at the end of the test and will
only be removed after they have triggered and returned False.

Change the test timeout code to use a helper and ensure the GSource is
unregistered again when the test exits. While this is not an actual
problem, it does mean that python can garbage collect the TestDbus
instance earlier as it is otherwise kept alive until the GSource is
free'ed and the reference to the timeout method has been dropped.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Reviewed-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>

diff --git a/tests/hwsim/test_dbus.py b/tests/hwsim/test_dbus.py
index 15f3b31a65cec21fff4796edd93a2a2a7cf2a9eb..0f854b0df1e0714360857bc8047cc04df1ff0573 100644 (file)
--- a/tests/hwsim/test_dbus.py
+++ b/tests/hwsim/test_dbus.py
@@ -79,11 +79,15 @@ class TestDbus(object):
         self.loop = gobject.MainLoop()
         self.signals = []
         self.bus = bus
+        self._timeout_id = 0
 
     def __exit__(self, type, value, traceback):
         for s in self.signals:
             s.remove()
 
+        if self._timeout_id:
+            gobject.source_remove(self._timeout_id)
+
     def add_signal(self, handler, interface, name, byte_arrays=False):
         # Insert sleep to ensure WPA_DBUS_SEND_PROP_CHANGED_TIMEOUT passes
         def int_handler(*args):
@@ -96,9 +100,16 @@ class TestDbus(object):
                                          byte_arrays=byte_arrays)
         self.signals.append(s)
 
-    def timeout(self, *args):
+    def set_timeout(self, timeout):
+        if self._timeout_id:
+            gobject.source_remove(self._timeout_id)
+        self._timeout_id = gobject.timeout_add(timeout, self._timeout)
+
+    def _timeout(self, *args):
         logger.debug("timeout")
         self.loop.quit()
+
+        self._timeout_id = 0
         return False
 
 class alloc_fail_dbus(object):
@@ -491,7 +502,7 @@ def _test_dbus_get_set_wps(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_sets)
-            gobject.timeout_add(1000, self.timeout)
+            self.set_timeout(1000)
             self.add_signal(self.propertiesChanged, WPAS_DBUS_IFACE_WPS,
                             "PropertiesChanged")
             self.add_signal(self.propertiesChanged2, dbus.PROPERTIES_IFACE,
@@ -672,7 +683,7 @@ def _test_dbus_wps_pbc(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.start_pbc)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.wpsEvent, WPAS_DBUS_IFACE_WPS, "Event")
             self.add_signal(self.credentials, WPAS_DBUS_IFACE_WPS,
                             "Credentials")
@@ -732,7 +743,7 @@ def test_dbus_wps_pbc_overlap(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.start_pbc)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.wpsEvent, WPAS_DBUS_IFACE_WPS, "Event")
             self.loop.run()
             return self
@@ -786,7 +797,7 @@ def _test_dbus_wps_pin(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.start_pin)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.wpsEvent, WPAS_DBUS_IFACE_WPS, "Event")
             self.add_signal(self.credentials, WPAS_DBUS_IFACE_WPS,
                             "Credentials")
@@ -846,7 +857,7 @@ def _test_dbus_wps_pin2(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.start_pin)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.wpsEvent, WPAS_DBUS_IFACE_WPS, "Event")
             self.add_signal(self.credentials, WPAS_DBUS_IFACE_WPS,
                             "Credentials")
@@ -909,7 +920,7 @@ def _test_dbus_wps_pin_m2d(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.start_pin)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.wpsEvent, WPAS_DBUS_IFACE_WPS, "Event")
             self.add_signal(self.credentials, WPAS_DBUS_IFACE_WPS,
                             "Credentials")
@@ -972,7 +983,7 @@ def _test_dbus_wps_reg(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(100, self.start_reg)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.wpsEvent, WPAS_DBUS_IFACE_WPS, "Event")
             self.add_signal(self.credentials, WPAS_DBUS_IFACE_WPS,
                             "Credentials")
@@ -1115,7 +1126,7 @@ def test_dbus_scan(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_scan)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.scanDone, WPAS_DBUS_IFACE, "ScanDone")
             self.add_signal(self.bssAdded, WPAS_DBUS_IFACE, "BSSAdded")
             self.add_signal(self.bssRemoved, WPAS_DBUS_IFACE, "BSSRemoved")
@@ -1323,7 +1334,7 @@ def test_dbus_connect(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_connect)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.networkAdded, WPAS_DBUS_IFACE, "NetworkAdded")
             self.add_signal(self.networkRemoved, WPAS_DBUS_IFACE,
                             "NetworkRemoved")
@@ -1424,7 +1435,7 @@ def test_dbus_remove_connected(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_connect)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.networkAdded, WPAS_DBUS_IFACE, "NetworkAdded")
             self.add_signal(self.networkRemoved, WPAS_DBUS_IFACE,
                             "NetworkRemoved")
@@ -1523,7 +1534,7 @@ def test_dbus_connect_psk_mem(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_connect)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.propertiesChanged, WPAS_DBUS_IFACE,
                             "PropertiesChanged")
             self.add_signal(self.networkRequest, WPAS_DBUS_IFACE,
@@ -1583,7 +1594,7 @@ def test_dbus_connect_oom(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_connect)
-            gobject.timeout_add(1500, self.timeout)
+            self.set_timeout(1500)
             self.add_signal(self.networkAdded, WPAS_DBUS_IFACE, "NetworkAdded")
             self.add_signal(self.networkRemoved, WPAS_DBUS_IFACE,
                             "NetworkRemoved")
@@ -1759,7 +1770,7 @@ def test_dbus_connect_eap(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_connect)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.propertiesChanged, WPAS_DBUS_IFACE,
                             "PropertiesChanged")
             self.add_signal(self.certification, WPAS_DBUS_IFACE,
@@ -2249,7 +2260,7 @@ def test_dbus_blob(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_blob)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.blobAdded, WPAS_DBUS_IFACE, "BlobAdded")
             self.add_signal(self.blobRemoved, WPAS_DBUS_IFACE, "BlobRemoved")
             self.loop.run()
@@ -2397,7 +2408,7 @@ def test_dbus_tdls(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_tdls)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.propertiesChanged, WPAS_DBUS_IFACE,
                             "PropertiesChanged")
             self.loop.run()
@@ -2468,7 +2479,7 @@ def test_dbus_tdls_channel_switch(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_tdls)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.propertiesChanged, WPAS_DBUS_IFACE,
                             "PropertiesChanged")
             self.loop.run()
@@ -2863,7 +2874,7 @@ def test_dbus_probe_req_reporting(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.groupStarted, WPAS_DBUS_IFACE_P2PDEVICE,
                             "GroupStarted")
             self.add_signal(self.probeRequest, WPAS_DBUS_IFACE, "ProbeRequest",
@@ -3271,7 +3282,7 @@ def run_dbus_p2p_discovery(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.add_signal(self.deviceFoundProperties,
@@ -3421,7 +3432,7 @@ def test_dbus_p2p_discovery_freq(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(5000, self.timeout)
+            self.set_timeout(5000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.loop.run()
@@ -3631,7 +3642,7 @@ def test_dbus_p2p_service_discovery_query(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.add_signal(self.serviceDiscoveryResponse,
@@ -3692,7 +3703,7 @@ def _test_dbus_p2p_service_discovery_external(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.add_signal(self.serviceDiscoveryRequest,
@@ -3758,7 +3769,7 @@ def test_dbus_p2p_autogo(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.add_signal(self.groupStarted, WPAS_DBUS_IFACE_P2PDEVICE,
@@ -4029,7 +4040,7 @@ def test_dbus_p2p_autogo_pbc(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.add_signal(self.groupStarted, WPAS_DBUS_IFACE_P2PDEVICE,
@@ -4115,7 +4126,7 @@ def test_dbus_p2p_autogo_legacy(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.groupStarted, WPAS_DBUS_IFACE_P2PDEVICE,
                             "GroupStarted")
             self.add_signal(self.groupFinished, WPAS_DBUS_IFACE_P2PDEVICE,
@@ -4188,7 +4199,7 @@ def test_dbus_p2p_join(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.add_signal(self.groupStarted, WPAS_DBUS_IFACE_P2PDEVICE,
@@ -4315,7 +4326,7 @@ def test_dbus_p2p_invitation_received(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.invitationReceived, WPAS_DBUS_IFACE_P2PDEVICE,
                             "InvitationReceived")
             self.loop.run()
@@ -4449,7 +4460,7 @@ def test_dbus_p2p_persistent(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.groupStarted, WPAS_DBUS_IFACE_P2PDEVICE,
                             "GroupStarted")
             self.add_signal(self.groupFinished, WPAS_DBUS_IFACE_P2PDEVICE,
@@ -4548,7 +4559,7 @@ def test_dbus_p2p_reinvoke_persistent(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.add_signal(self.groupStarted, WPAS_DBUS_IFACE_P2PDEVICE,
@@ -4675,7 +4686,7 @@ def test_dbus_p2p_go_neg_rx(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.add_signal(self.goNegotiationRequest,
@@ -4759,7 +4770,7 @@ def test_dbus_p2p_go_neg_auth(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.add_signal(self.goNegotiationSuccess,
@@ -4858,7 +4869,7 @@ def test_dbus_p2p_go_neg_init(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.add_signal(self.goNegotiationSuccess,
@@ -4951,7 +4962,7 @@ def test_dbus_p2p_group_termination_by_go(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.add_signal(self.goNegotiationSuccess,
@@ -5045,7 +5056,7 @@ def _test_dbus_p2p_group_idle_timeout(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.add_signal(self.goNegotiationSuccess,
@@ -5138,7 +5149,7 @@ def test_dbus_p2p_wps_failure(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.goNegotiationRequest,
                             WPAS_DBUS_IFACE_P2PDEVICE,
                             "GONegotiationRequest",
@@ -5224,7 +5235,7 @@ def test_dbus_p2p_two_groups(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.propertiesChanged, dbus.PROPERTIES_IFACE,
                             "PropertiesChanged", byte_arrays=True)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
@@ -5408,7 +5419,7 @@ def test_dbus_p2p_cancel(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.deviceFound, WPAS_DBUS_IFACE_P2PDEVICE,
                             "DeviceFound")
             self.loop.run()
@@ -5478,7 +5489,7 @@ def test_dbus_p2p_ip_addr(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.groupStarted, WPAS_DBUS_IFACE_P2PDEVICE,
                             "GroupStarted")
             self.loop.run()
@@ -5606,7 +5617,7 @@ def test_dbus_ap(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_connect)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.networkAdded, WPAS_DBUS_IFACE, "NetworkAdded")
             self.add_signal(self.networkSelected, WPAS_DBUS_IFACE,
                             "NetworkSelected")
@@ -5708,7 +5719,7 @@ def test_dbus_ap_scan(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_connect)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.propertiesChanged, WPAS_DBUS_IFACE,
                             "PropertiesChanged")
             self.add_signal(self.scanDone, WPAS_DBUS_IFACE, "ScanDone")
@@ -5769,7 +5780,7 @@ def test_dbus_connect_wpa_eap(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_connect)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.propertiesChanged, WPAS_DBUS_IFACE,
                             "PropertiesChanged")
             self.add_signal(self.eap, WPAS_DBUS_IFACE, "EAP")
@@ -6013,7 +6024,7 @@ def test_dbus_assoc_reject(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_connect)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.propertiesChanged, WPAS_DBUS_IFACE,
                             "PropertiesChanged")
             self.loop.run()
@@ -6062,7 +6073,7 @@ def test_dbus_mesh(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_test)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.meshGroupStarted, WPAS_DBUS_IFACE_MESH,
                             "MeshGroupStarted")
             self.add_signal(self.meshGroupRemoved, WPAS_DBUS_IFACE_MESH,
@@ -6140,7 +6151,7 @@ def test_dbus_roam(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_connect)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.propertiesChanged, WPAS_DBUS_IFACE,
                             "PropertiesChanged")
             self.loop.run()
@@ -6261,7 +6272,7 @@ def test_dbus_interworking(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_select)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.interworkingAPAdded, WPAS_DBUS_IFACE,
                             "InterworkingAPAdded")
             self.add_signal(self.interworkingSelectDone, WPAS_DBUS_IFACE,
@@ -6334,7 +6345,7 @@ def test_dbus_hs20_terms_and_conditions(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_connect)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.hs20TermsAndConditions, WPAS_DBUS_IFACE,
                             "HS20TermsAndConditions")
             self.loop.run()
@@ -6423,7 +6434,7 @@ def test_dbus_anqp_query_done(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_query)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.anqpQueryDone, WPAS_DBUS_IFACE,
                             "ANQPQueryDone")
             self.loop.run()
@@ -6471,7 +6482,7 @@ def test_dbus_bss_anqp_properties(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.run_query)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.propertiesChanged, WPAS_DBUS_BSS,
                             "PropertiesChanged")
             self.loop.run()
@@ -6513,7 +6524,7 @@ def test_dbus_nan_usd_publish(dev, apdev):
         def __enter__(self):
             gobject.timeout_add(1, self.start_publish)
             gobject.timeout_add(500, self.stop_publish)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.nanPublishTerminated, WPAS_DBUS_IFACE,
                             "NANPublishTerminated")
             self.loop.run()
@@ -6557,7 +6568,7 @@ def test_dbus_nan_usd_subscribe(dev, apdev):
         def __enter__(self):
             gobject.timeout_add(1, self.start_subscribe)
             gobject.timeout_add(500, self.stop_subscribe)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.nanSubscribeTerminated, WPAS_DBUS_IFACE,
                             "NANSubscribeTerminated")
             self.loop.run()
@@ -6602,7 +6613,7 @@ def test_dbus_nan_usd_subscribe_followup(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.start_subscribe)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.nanDiscoveryResult, WPAS_DBUS_IFACE,
                             "NANDiscoveryResult")
             self.add_signal(self.nanSubscribeTerminated, WPAS_DBUS_IFACE,
@@ -6684,7 +6695,7 @@ def test_dbus_nan_usd_publish_followup(dev, apdev):
 
         def __enter__(self):
             gobject.timeout_add(1, self.start_publish)
-            gobject.timeout_add(15000, self.timeout)
+            self.set_timeout(15000)
             self.add_signal(self.nanPublishTerminated, WPAS_DBUS_IFACE,
                             "NANPublishTerminated")
             self.add_signal(self.nanReceive, WPAS_DBUS_IFACE,