File 3804-ssh-Test-cuddling-logging.patch of Package erlang
From 59b0d10d9b82e2853ece730ec88b942985bfa217 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 30 Jun 2020 13:27:34 +0200
Subject: [PATCH 4/4] ssh: Test cuddling (logging)
---
lib/ssh/test/ssh_agent_SUITE.erl | 1 +
lib/ssh/test/ssh_basic_SUITE.erl | 3 +++
lib/ssh/test/ssh_sftp_SUITE.erl | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/ssh/test/ssh_agent_SUITE.erl b/lib/ssh/test/ssh_agent_SUITE.erl
index e22c13ee8d..a371c7938e 100644
--- a/lib/ssh/test/ssh_agent_SUITE.erl
+++ b/lib/ssh/test/ssh_agent_SUITE.erl
@@ -173,6 +173,7 @@ chk_unix_domain_socket(Config0) ->
file:delete(SocketPath),
{skip, "Unix Domain Sockets are not supported"};
{ok, Socket} ->
+ ct:log("Socket = ~p", [Socket]),
gen_tcp:close(Socket),
file:delete(SocketPath),
Config
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 5c6798bbcb..62878ed722 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -1148,6 +1148,8 @@ daemon_opt_fd(Config) ->
file:make_dir(UserDir),
{ok,S1} = gen_tcp:listen(0,[]),
+ ct:log("Socket S1 = ~p", [S1]),
+
{ok,Fd1} = prim_inet:getfd(S1),
{ok,Pid1} = ssh:daemon(0, [{system_dir, SystemDir},
@@ -1177,6 +1179,7 @@ multi_daemon_opt_fd(Config) ->
Test =
fun() ->
{ok,S} = gen_tcp:listen(0,[]),
+ ct:log("Socket S = ~p", [S]),
{ok,Fd} = prim_inet:getfd(S),
{ok,Pid} = ssh:daemon(0, [{system_dir, SystemDir},
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
index 14d1a0173d..89f449040a 100644
--- a/lib/ssh/test/ssh_sftp_SUITE.erl
+++ b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -775,7 +775,7 @@ start_channel_sock(Config) ->
%% Test that the socket is closed when the Connection closes
ok = ssh:close(Conn),
timer:sleep(400), %% Until the stop sequence is fixed
- {error,einval} = inet:getopts(Sock, [active]),
+ {error,_} = inet:getopts(Sock, [active]),
ok.
--
2.26.2