From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Tue, 7 Apr 2020 01:18:33 +0000 (+0200)
Subject: lib-http: test-http-payload - Adjust log prefix code to match other similar unit... 
X-Git-Tag: 2.3.13~715
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37d14476b613c5e276733f6edc8388a404b69394;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: test-http-payload - Adjust log prefix code to match other similar unit tests.
---

diff --git a/src/lib-http/test-http-payload.c b/src/lib-http/test-http-payload.c
index c1fa0c9264..4aae08a8df 100644
--- a/src/lib-http/test-http-payload.c
+++ b/src/lib-http/test-http-payload.c
@@ -1623,10 +1623,10 @@ test_run_client_server(
 		server_pid = (pid_t)-1;
 		hostpid_init();
 		lib_signals_deinit();
-		if (debug)
-			i_debug("server: PID=%s", my_pid);
-		i_set_failure_prefix("SERVER: ");
 		/* child: server */
+		i_set_failure_prefix("SERVER: ");
+		if (debug)
+			i_debug("PID=%s", my_pid);
 		ioloop_nested = NULL;
 		ioloop_nested_depth = 0;
 		ioloop = io_loop_create();
@@ -1644,10 +1644,10 @@ test_run_client_server(
 
 	lib_signals_ioloop_attach();
 
-	if (debug)
-		i_debug("client: PID=%s", my_pid);
-	i_set_failure_prefix("CLIENT: ");
 	/* parent: client */
+	i_set_failure_prefix("CLIENT: ");
+	if (debug)
+		i_debug("PID=%s", my_pid);
 	ioloop_nested = NULL;
 	ioloop_nested_depth = 0;
 	ioloop = io_loop_create();
@@ -1655,8 +1655,9 @@ test_run_client_server(
 	io_loop_run(ioloop);
 	test_client_deinit();
 	io_loop_destroy(&ioloop);
-	test_server_kill_forced();
 
+	i_unset_failure_prefix();
+	test_server_kill_forced();
 	test_files_deinit();
 }