File 4711-ssl-ocsp-test-cuddle.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 4711-ssl-ocsp-test-cuddle.patch of Package erlang

From 04e9366c62c6cc35147a3e531851b710e9128662 Mon Sep 17 00:00:00 2001
From: Jakub Witczak <kuba@erlang.org>
Date: Mon, 28 Mar 2022 14:26:41 +0200
Subject: [PATCH] ssl: ocsp test cuddle

- fix stability of openssl_oscp_SUITE
---
 lib/ssl/test/openssl_ocsp_SUITE.erl | 12 +-----------
 lib/ssl/test/ssl_test_lib.erl       |  3 ++-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/lib/ssl/test/openssl_ocsp_SUITE.erl b/lib/ssl/test/openssl_ocsp_SUITE.erl
index 8bf84abedb..888a0ab3c4 100644
--- a/lib/ssl/test/openssl_ocsp_SUITE.erl
+++ b/lib/ssl/test/openssl_ocsp_SUITE.erl
@@ -121,13 +121,7 @@ end_per_group(GroupName, Config) ->
 
 %%--------------------------------------------------------------------
 init_per_testcase(_TestCase, Config) ->
-    Timetrap = case group_name(Config) of
-                   'dtlsv1.2' ->
-                       {seconds, 300}; % DTLS require more time for handling retransmissions
-                   _ ->
-                       {seconds, 10}
-               end,
-    ct:timetrap(Timetrap),
+    ct:timetrap({seconds, 10}),
     ssl_test_lib:ct_log_supported_protocol_versions(Config),
     Config.
 
@@ -282,7 +276,3 @@ get_free_port() ->
     {ok, Port} = inet:port(Listen),
     ok = gen_tcp:close(Listen),
     Port.
-
-group_name(Config) ->
-    GroupProp = proplists:get_value(tc_group_properties, Config),
-    proplists:get_value(name, GroupProp).
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index d5899d9711..0e9e4d7490 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -2076,7 +2076,8 @@ run_client_error(Opts) ->
     Port = proplists:get_value(port, Opts),
     Pid = proplists:get_value(from, Opts),
     Transport = proplists:get_value(transport, Opts, ssl),
-    Options = proplists:get_value(options, Opts),
+    Options0 = proplists:get_value(options, Opts),
+    Options = patch_dtls_options(Options0),
     ct:log("~p:~p~nssl:connect(~p, ~p, ~p)~n", [?MODULE,?LINE, Host, Port, Options]),
     Error = Transport:connect(Host, Port, Options),
     case Error of
-- 
2.34.1

Places

File 4711-ssl-ocsp-test-cuddle.patch of Package erlang

Places