colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: fix quitting mainloop in test-networkmanager-service.py

Browse Source 
Previously, the callbacks would return gl.mainloop.quit(), which is None
and thus the source got removed already. The later GLib.source_remove()
would thus use an invalid source-id.

Fix that, by no removing the source id from the callback.

Fixes: b1ff82eba5
This commit is contained in:
Thomas Haller
2018-05-15 11:38:05 +02:00
parent d66b277471
commit c905ee94f0
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/test-networkmanager-service.py
View File

@@ -1392,13 +1392,12 @@ def main():
raise AssertionError("Failure to request D-Bus name org.freedesktop.NetworkManager") raise AssertionError("Failure to request D-Bus name org.freedesktop.NetworkManager")
# Watch stdin; if it closes, assume our parent has crashed, and exit # Watch stdin; if it closes, assume our parent has crashed, and exit
io = GLib.IOChannel(0) id1 = GLib.IOChannel(0).add_watch(GLib.IOCondition.HUP,
id1 = io.add_watch(GLib.IOCondition.HUP, lambda io, condition: gl.mainloop.quit() or True)
lambda io, condition: gl.mainloop.quit())
# also quit after inactivity to ensure we don't stick around if the above fails somehow # also quit after inactivity to ensure we don't stick around if the above fails somehow
id2 = GLib.timeout_add_seconds(20, id2 = GLib.timeout_add_seconds(20,
lambda: gl.mainloop.quit()) lambda: gl.mainloop.quit() or True)
gl.mainloop.run() gl.mainloop.run()