File 0416-ssl-Kill-OpenSSL-processes-that-survived-test-run.patch of Package erlang

From 85b03b8b996549631bb2aa12807243c34df28e7f Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Wed, 19 Jun 2019 14:10:30 +0200
Subject: [PATCH] ssl: Kill OpenSSL processes that survived test run

Should be zero such processes in the normal case
---
 lib/ssl/test/openssl_server_cipher_suite_SUITE.erl | 3 ++-
 lib/ssl/test/ssl_ECC_openssl_SUITE.erl             | 3 ++-
 lib/ssl/test/ssl_test_lib.erl                      | 8 ++++++++
 lib/ssl/test/ssl_to_openssl_SUITE.erl              | 4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
index 68d4e910fd..787c08a517 100644
--- a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
@@ -67,7 +67,8 @@ init_per_suite(Config0) ->
 
 end_per_suite(_Config) ->
     application:stop(ssl),
-    application:stop(crypto).
+    application:stop(crypto),
+    ssl_test_lib:kill_openssl().
 
 %%--------------------------------------------------------------------
 init_per_group(GroupName, Config) ->
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 32fd917937..6c8ce7a0bc 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -2379,3 +2379,11 @@ digest() ->
     ssl_test_lib:close(Client3),
     ssl_test_lib:close(Client4).
     
+
+kill_openssl() ->
+    case os:type() of
+        {unix, _} ->
+            os:cmd("pkill openssl");
+        {win32, _} ->
+            os:cmd("cmd.exe /C \"taskkill /IM openssl.exe /F\"")
+    end.
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 07abddbcf7..31d9af5298 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -179,8 +179,8 @@ init_per_suite(Config0) ->
 
 end_per_suite(_Config) ->
     ssl:stop(),
-    application:stop(crypto).
-
+    application:stop(crypto),
+    ssl_test_lib:kill_openssl().
 
 init_per_group(GroupName, Config) ->
     case ssl_test_lib:is_tls_version(GroupName) of
-- 
2.16.4

openSUSE Build Service is sponsored by