diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-06-18 11:24:00 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-06-18 11:33:15 +0200 |
| commit | 296da44235815ff32202f2afe9c990e94e4824ea (patch) | |
| tree | 3562328101b77734323591ea59977d2f4b9b818f /tools | |
| parent | efddb0cef5187f4f77d0c6b94f75063ad8f9d6a2 (diff) | |
| download | NetworkManager-296da44235815ff32202f2afe9c990e94e4824ea.tar.gz | |
tests: don't exit test-networkmanager-service.py after 20 seconds
Tests might just take longer than 20 seconds.
Also, we already watch stdin to determine whether the service
should exit.
(cherry picked from commit 4e18ef49bf2527b4c29a0bdff2faddf0194dd5bd)
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/test-networkmanager-service.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index f6da6e1fd7..7fbed7ec93 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -2252,14 +2252,9 @@ def main(): id1 = GLib.IOChannel(0).add_watch(GLib.IOCondition.HUP, lambda io, condition: gl.mainloop.quit() or True) - # also quit after inactivity to ensure we don't stick around if the above fails somehow - id2 = GLib.timeout_add_seconds(20, - lambda: gl.mainloop.quit() or True) - gl.mainloop.run() GLib.source_remove(id1) - GLib.source_remove(id2) gl.agent_manager.remove_from_connection() gl.dns_manager.unexport() |