fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 09:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/tests: fix test_nm_utils_kill_child() under meson

Browse source 
meson spawns the tests in a way that the test process is
a session leader. Since the test wants to create a new
process group to kill a group of processes that it starts,
it failed.

  $ meson test -C build test-general-with-expect

The test would have succeed when wrapping the test for example
by strace:

  $ meson test -C build --wrap='strace' test-general-with-expect

Fix that, by forking once more.
This commit is contained in:
Thomas Haller 2017-12-15 09:28:42 +01:00
parent c04f4febfe
commit bb7fcdf21e
1 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/tests/test-general-with-expect.c
View file

@ -167,7 +167,7 @@ test_nm_utils_kill_child_spawn (char **argv, gboolean do_not_reap_child)
} }
static pid_t static pid_t
test_nm_utils_kill_child_create_and_join_pgroup (void) do_test_nm_utils_kill_child_create_and_join_pgroup (void)
{ {
int err, tmp = 0; int err, tmp = 0;
int pipefd[2]; int pipefd[2];
@ -177,10 +177,7 @@ test_nm_utils_kill_child_create_and_join_pgroup (void)
g_assert (err == 0); g_assert (err == 0);
pgid = fork(); pgid = fork();
if (pgid < 0) { g_assert (pgid >= 0);
g_assert_not_reached ();
return pgid;
}
if (pgid == 0) { if (pgid == 0) {
/* child process... */ /* child process... */
@ -206,7 +203,6 @@ test_nm_utils_kill_child_create_and_join_pgroup (void)
err = setpgid (0, pgid); err = setpgid (0, pgid);
g_assert (err == 0); g_assert (err == 0);
do { do {
err = waitpid (pgid, &tmp, 0); err = waitpid (pgid, &tmp, 0);
} while (err == -1 && errno == EINTR); } while (err == -1 && errno == EINTR);
@ -280,7 +276,6 @@ do_test_nm_utils_kill_child (void)
/* give processes time to start (and potentially block signals) ... */ /* give processes time to start (and potentially block signals) ... */
g_usleep (G_USEC_PER_SEC / 10); g_usleep (G_USEC_PER_SEC / 10);
fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK); fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
g_test_expect_message ("NetworkManager", G_LOG_LEVEL_DEBUG, "*kill child process 'test-s-1-1' (*): waiting up to 3000 milliseconds for process to terminate normally after sending SIGTERM (15)..."); g_test_expect_message ("NetworkManager", G_LOG_LEVEL_DEBUG, "*kill child process 'test-s-1-1' (*): waiting up to 3000 milliseconds for process to terminate normally after sending SIGTERM (15)...");
@ -365,16 +360,38 @@ static void
test_nm_utils_kill_child (void) test_nm_utils_kill_child (void)
{ {
int err; int err;
int exit_status;
pid_t gpid; pid_t gpid;
pid_t child_pid;
gpid = test_nm_utils_kill_child_create_and_join_pgroup (); /* the tests spawns several processes, we want to clean them up
* by sending a SIGKILL to the process group.
*
* The current process might be a session leader, which prevents it from
* creating a new process group. Hence, first fork and let the child
* create a new process group, run the tests, and kill all pending
* processes. */
child_pid = fork ();
g_assert (child_pid >= 0);
do_test_nm_utils_kill_child (); if (child_pid == 0) {
gpid = do_test_nm_utils_kill_child_create_and_join_pgroup ();
err = setpgid (0, 0); do_test_nm_utils_kill_child ();
g_assert (err == 0);
kill (-gpid, SIGKILL); err = setpgid (0, 0);
g_assert (err == 0);
kill (-gpid, SIGKILL);
exit (0);
};
do {
err = waitpid (child_pid, &exit_status, 0);
} while (err == -1 && errno == EINTR);
g_assert (err == child_pid);
g_assert (WIFEXITED (exit_status) && WEXITSTATUS(exit_status) == 0);
} }
/*****************************************************************************/ /*****************************************************************************/