File 2977-ssl-Fix-the-ssl_app_env_SUITE.patch of Package erlang
From 7e007a1f2fd0811392bbc945949923279e9d3ed2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Dimitrov?= <peterdmv@erlang.org>
Date: Wed, 25 Mar 2020 12:38:46 +0100
Subject: [PATCH 07/12] ssl: Fix the ssl_app_env_SUITE
---
lib/ssl/test/ssl_app_env_SUITE.erl | 28 ++++++++--------------------
1 file changed, 8 insertions(+), 20 deletions(-)
diff --git a/lib/ssl/test/ssl_app_env_SUITE.erl b/lib/ssl/test/ssl_app_env_SUITE.erl
index 233985c729..81cf5f1cdd 100644
--- a/lib/ssl/test/ssl_app_env_SUITE.erl
+++ b/lib/ssl/test/ssl_app_env_SUITE.erl
@@ -74,29 +74,17 @@ end_per_suite(_Config) ->
application:unload(ssl),
application:stop(crypto).
-
-init_per_group(GroupName, Config) ->
- case ssl_test_lib:is_tls_version(GroupName) of
- true ->
- case ssl_test_lib:sufficient_crypto_support(GroupName) of
- true ->
- [{client_type, erlang},
- {server_type, erlang} | ssl_test_lib:init_tls_version(GroupName, Config)];
- false ->
- {skip, "Missing crypto support"}
- end;
- _ ->
- ssl:start(),
- Config
+init_per_group(GroupName, Config0) ->
+ case ssl_test_lib:init_per_group(GroupName, Config0) of
+ {skip, _} = Skip ->
+ Skip;
+ Config ->
+ [{client_type, erlang},
+ {server_type, erlang}| Config]
end.
end_per_group(GroupName, Config) ->
- case ssl_test_lib:is_tls_version(GroupName) of
- true ->
- ssl_test_lib:clean_tls_version(Config);
- false ->
- Config
- end.
+ ssl_test_lib:end_per_group(GroupName, Config).
init_per_testcase(internal_active_1, Config) ->
ssl_test_lib:ct_log_supported_protocol_versions(Config),
--
2.16.4