diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-10-07 11:18:33 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-10-07 11:18:33 +0200 |
| commit | 2db79403563179c1a29e6292172f5563acf13c70 (patch) | |
| tree | 7ffefc53c347326e24f28785241f1409a1ecbbf6 /tools | |
| parent | 5b9d4e305df987ddad7f3d05afd709a70cddf7fd (diff) | |
| parent | 790e3946f0274a272fdda4d8697ce31a757a48d2 (diff) | |
Merge remote-tracking branch 'salsa/master'
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/test-networkmanager-service.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index c921aede..fbf95b03 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -2343,8 +2343,10 @@ def main(): raise AssertionError("Failure to request D-Bus name org.freedesktop.NetworkManager") # Watch stdin; if it closes, assume our parent has crashed, and exit - id1 = GLib.IOChannel(0).add_watch(GLib.IOCondition.HUP, - lambda io, condition: gl.mainloop.quit() or True) + id1 = GLib.io_add_watch(GLib.IOChannel.unix_new(0), + GLib.PRIORITY_DEFAULT, + GLib.IO_HUP, + lambda io, condition: gl.mainloop.quit() or True) gl.mainloop.run() |