File 1014-ssl-increase-pem-cache-interval-for-proble... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1014-ssl-increase-pem-cache-interval-for-problematic-test.patch of Package erlang

From 2b2b7f987c0eb61a63a441578f5542621eb3f984 Mon Sep 17 00:00:00 2001
From: Jakub Witczak <kuba@erlang.org>
Date: Sun, 31 Jul 2022 19:38:03 +0200
Subject: [PATCH] ssl: increase pem cache interval for problematic test case

---
 lib/ssl/test/ssl_pem_cache_SUITE.erl | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/ssl/test/ssl_pem_cache_SUITE.erl b/lib/ssl/test/ssl_pem_cache_SUITE.erl
index 467e61017c..bb68b3f7b8 100644
--- a/lib/ssl/test/ssl_pem_cache_SUITE.erl
+++ b/lib/ssl/test/ssl_pem_cache_SUITE.erl
@@ -70,6 +70,7 @@
 
 
 -define(CLEANUP_INTERVAL, 5000).
+-define(BIG_CLEANUP_INTERVAL, 600000).
 -define(SLEEP_AMOUNT, 1000).
 -define(KEY(NUMBER), ssl_test_lib:hardcode_rsa_key(NUMBER)).
 
@@ -113,23 +114,26 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 init_per_testcase(pem_certfile_keyfile_periodical_cleanup = Case, Config) ->
-    adjust_pem_periodical_cleanup_interval(Case, Config),
+    adjust_pem_periodical_cleanup_interval(Case, Config, ?CLEANUP_INTERVAL),
     Config;
 init_per_testcase(pem_cacertfile_periodical_cleanup = Case, Config) ->
-    adjust_pem_periodical_cleanup_interval(Case, Config),
+    adjust_pem_periodical_cleanup_interval(Case, Config, ?CLEANUP_INTERVAL),
     Config;
 init_per_testcase(new_root_pem_periodical_cleanup = Case, Config) ->
-    adjust_pem_periodical_cleanup_interval(Case, Config),
+    adjust_pem_periodical_cleanup_interval(Case, Config, ?CLEANUP_INTERVAL),
+    Config;
+init_per_testcase(new_root_pem_manual_cleanup = Case, Config) ->
+    adjust_pem_periodical_cleanup_interval(Case, Config, ?BIG_CLEANUP_INTERVAL),
     Config;
 init_per_testcase(_Case, Config) ->
     ssl_test_lib:clean_start(),
     ct:timetrap({seconds, 20}),
     Config.
 
-adjust_pem_periodical_cleanup_interval(Case, Config)->
+adjust_pem_periodical_cleanup_interval(Case, Config, Interval) ->
     application:load(ssl),
     end_per_testcase(Case, Config) ,
-    application:set_env(ssl, ssl_pem_cache_clean, ?CLEANUP_INTERVAL),
+    application:set_env(ssl, ssl_pem_cache_clean, Interval),
     ssl:start(),
     ct:timetrap({minutes, 1}).
 
-- 
2.35.3

Places

File 1014-ssl-increase-pem-cache-interval-for-problematic-test.patch of Package erlang

Places