shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-05 12:50:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

torture: Improve process termination function

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>

(cherry-picked from commit 0e98f121)
This commit is contained in:
Andreas Schneider
2015-10-01 13:55:13 +02:00
parent 1ebfd3834a
commit 130194aa0e
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/torture.c
View File

@@ -351,6 +351,8 @@ int torture_terminate_process(const char *pidfile)
ssize_t rc;
pid_t pid;
int fd;
int is_running = 1;
int count;
/* read the pidfile */
fd = open(pidfile, O_RDONLY);
@@ -373,11 +375,20 @@ int torture_terminate_process(const char *pidfile)
pid = (pid_t)(tmp & 0xFFFF);
/* Make sure the process goes away! */
kill(pid, SIGTERM);
for (count = 0; count < 10; count++) {
/* Make sure the daemon goes away! */
kill(pid, SIGTERM);
kill(pid, 0);
if (rc == 0) {
usleep(200);
rc = kill(pid, 0);
if (rc != 0) {
is_running = 0;
break;
}
}
if (is_running) {
fprintf(stderr,
"WARNING: The process server is still running!\n");
}
@@ -890,7 +901,7 @@ void torture_teardown_sshd_server(void **state)
rc = torture_terminate_process(s->srv_pidfile);
if (rc != 0) {
fprintf(stderr, "Failed to terminate sshd");
fprintf(stderr, "XXXXXX Failed to terminate sshd\n");
}
torture_teardown_socket_dir(state);