From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Fri, 3 Apr 2020 19:46:30 +0000 (+0200)
Subject: lib-http: test-http-payload - Call test_files_init/deinit() in test_run_client_server().
X-Git-Tag: 2.3.13~718
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9623808030ba2a549da0187f0d0e97a353ced327;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: test-http-payload - Call test_files_init/deinit() in test_run_client_server().
---

diff --git a/src/lib-http/test-http-payload.c b/src/lib-http/test-http-payload.c
index 6dcfd4ea75..0d1ff45454 100644
--- a/src/lib-http/test-http-payload.c
+++ b/src/lib-http/test-http-payload.c
@@ -1613,6 +1613,8 @@ test_run_client_server(
 	failure = NULL;
 	test_open_server_fd();
 
+	test_files_init();
+
 	lib_signals_ioloop_detach();
 
 	if ((server_pid = fork()) == (pid_t)-1)
@@ -1654,6 +1656,8 @@ test_run_client_server(
 	test_client_deinit();
 	io_loop_destroy(&ioloop);
 	test_server_kill();
+
+	test_files_deinit();
 }
 
 static void
@@ -1713,9 +1717,7 @@ test_run_sequential(
 	http_client_set.max_parallel_connections = 1;
 	http_client_set.max_pipelined_requests = 1;
 
-	test_files_init();
 	test_run_client_server(&http_client_set, &http_server_set, client_init);
-	test_files_deinit();
 
 	test_out_reason("sequential", (failure == NULL), failure);
 }
@@ -1747,9 +1749,7 @@ test_run_pipeline(
 	http_client_set.max_parallel_connections = 1;
 	http_client_set.max_pipelined_requests = 8;
 
-	test_files_init();
 	test_run_client_server(&http_client_set, &http_server_set, client_init);
-	test_files_deinit();
 
 	test_out_reason("pipeline", (failure == NULL), failure);
 }
@@ -1781,9 +1781,7 @@ test_run_parallel(
 	http_client_set.max_parallel_connections = 40;
 	http_client_set.max_pipelined_requests = 8;
 
-	test_files_init();
 	test_run_client_server(&http_client_set, &http_server_set, client_init);
-	test_files_deinit();
 
 	test_out_reason("parallel", (failure == NULL), failure);
 }