]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
master: test-master-login-auth - Rename test_server_kill() to test_servers_kill_forced().
authorStephan Bosch <stephan.bosch@open-xchange.com>
Fri, 10 Apr 2020 22:40:19 +0000 (00:40 +0200)
committerStephan Bosch <stephan.bosch@open-xchange.com>
Mon, 25 May 2020 17:38:24 +0000 (19:38 +0200)
src/master/test-master-login-auth.c

index 0fbe0c90753aeec79a201a06c11edbc68281ee0a..025380fd94860490305bccfc5ae676289456a57d 100644 (file)
@@ -884,7 +884,7 @@ static int test_open_server_fd(void)
        return fd;
 }
 
-static void test_server_kill(void)
+static void test_server_kill_forced(void)
 {
        if (server_pid != (pid_t)-1) {
                (void)kill(server_pid, SIGKILL);
@@ -948,7 +948,7 @@ test_run_client_server(test_client_init_t *client_test,
        io_loop_destroy(&ioloop);
 
        i_unset_failure_prefix();
-       test_server_kill();
+       test_server_kill_forced();
        i_unlink_if_exists(TEST_SOCKET);
 }
 
@@ -967,7 +967,7 @@ static void test_signal_handler(const siginfo_t *si, void *context ATTR_UNUSED)
        terminating = 1;
 
        /* make sure we don't leave any pesky children alive */
-       test_server_kill();
+       test_server_kill_forced();
        (void)unlink(TEST_SOCKET);
 
        (void)signal(signo, SIG_DFL);
@@ -976,7 +976,7 @@ static void test_signal_handler(const siginfo_t *si, void *context ATTR_UNUSED)
 
 static void test_atexit(void)
 {
-       test_server_kill();
+       test_server_kill_forced();
        (void)unlink(TEST_SOCKET);
 }