diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2014-10-23 17:29:57 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2014-10-30 14:39:08 +0100 |
| commit | 7ad8b8a358a2d3297b6682e739023cd85c4bad93 (patch) | |
| tree | cb44e78fff6b7e90722ba90df4863f94951a58ed | |
| parent | afbc2571a13d043854708391b74e3be5f3035d1c (diff) | |
| download | NetworkManager-7ad8b8a358a2d3297b6682e739023cd85c4bad93.tar.gz | |
tests: Fix /general/nm_utils_kill_child race
/general/nm_utils_kill_child: **
GLib:ERROR:test-general-with-expect.c:105:test_nm_utils_kill_child_sync_do: Did not see expected message NetworkManager-DEBUG: *kill child process 'test-s-1-1' (*): waiting up to 500 milliseconds for process to terminate normally after sending SIGTERM (15)...
Aborted
The first test case assumes the child does not go away immediately after being
delivered a TERM signal. Add some delay to its teardown code path, so that NM
will set up the timeout the test expects.
| -rw-r--r-- | src/tests/test-general-with-expect.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c index f9dedbfef9..4d574ed74f 100644 --- a/src/tests/test-general-with-expect.c +++ b/src/tests/test-general-with-expect.c @@ -188,6 +188,7 @@ test_nm_utils_kill_child (void) char *argv1[] = { "sh", "-c", + "trap \"sleep 0.3; exit 10\" EXIT; " "sleep 100000; exit $? #" TEST_TOKEN, NULL, }; |