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

tests: Verify error returned by kill

Browse Source 
Verify the error code returned by kill() in torture_terminate_process().
The error code is raised when killing the process failed.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
(cherry picked from commit c8222dc1f6)

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Anderson Toshiyuki Sasaki
2020-01-30 18:57:09 +01:00
committed by Jakub Jelen
parent 7f20bbca62
commit a94ac4c080
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/client/torture_auth.c
View File

@@ -200,7 +200,8 @@ static int agent_teardown(void **state)
assert_non_null(ssh_agent_pidfile);
/* kill agent pid */
torture_terminate_process(ssh_agent_pidfile);
rc = torture_terminate_process(ssh_agent_pidfile);
assert_return_code(rc, errno);
unlink(ssh_agent_pidfile);

4
tests/server/torture_server_config.c
View File

@@ -285,9 +285,7 @@ static int stop_server(void **state)
assert_non_null(s);
rc = torture_terminate_process(s->srv_pidfile);
if (rc != 0) {
fprintf(stderr, "XXXXXX Failed to terminate sshd\n");
}
assert_return_code(rc, errno);
unlink(s->srv_pidfile);

18
tests/torture.c
View File

@@ -250,8 +250,12 @@ int torture_terminate_process(const char *pidfile)
rc = kill(pid, 0);
if (rc != 0) {
is_running = 0;
break;
/* Process not found */
if (errno == ESRCH) {
is_running = 0;
rc = 0;
break;
}
}
}
@@ -260,7 +264,7 @@ int torture_terminate_process(const char *pidfile)
"WARNING: The process with pid %u is still running!\n", pid);
}
return 0;
return rc;
}
ssh_session torture_ssh_session(struct torture_state *s,
@@ -933,9 +937,7 @@ torture_reload_sshd_server(void **state)
int rc;
rc = torture_terminate_process(s->srv_pidfile);
if (rc != 0) {
fprintf(stderr, "XXXXXX Failed to terminate sshd\n");
}
assert_return_code(rc, errno);
return torture_start_sshd_server(state);
}
@@ -973,9 +975,7 @@ void torture_teardown_sshd_server(void **state)
int rc;
rc = torture_terminate_process(s->srv_pidfile);
if (rc != 0) {
fprintf(stderr, "XXXXXX Failed to terminate sshd\n");
}
assert_return_code(rc, errno);
torture_teardown_socket_dir(state);
}