File 0269-ssh-Fix-compiler-warnings-in-tests.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0269-ssh-Fix-compiler-warnings-in-tests.patch of Package erlang (Revision c37f636f556d133a129c9e9a7093d763)

Currently displaying revision c37f636f556d133a129c9e9a7093d763 , Show latest

From b55f5f00028dca7efa6026e595ee5107486a484b Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Mon, 2 Aug 2021 18:44:35 +0200
Subject: [PATCH 2/2] ssh: Fix compiler warnings in tests

---
 lib/ssh/test/ssh_chan_behaviours_SUITE.erl |  7 +++----
 lib/ssh/test/ssh_connection_SUITE.erl      |  6 +++---
 lib/ssh/test/ssh_to_openssh_SUITE.erl      | 10 +++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/ssh/test/ssh_chan_behaviours_SUITE.erl b/lib/ssh/test/ssh_chan_behaviours_SUITE.erl
index 8d6ad13ef5..3c3d1d0981 100644
--- a/lib/ssh/test/ssh_chan_behaviours_SUITE.erl
+++ b/lib/ssh/test/ssh_chan_behaviours_SUITE.erl
@@ -90,7 +90,6 @@ end_per_testcase(_TC, Config) ->
     
 
 -define(EXPECT(What, Bind),
-        Bind =
             (fun() ->
                      receive What ->
                              ct:log("~p:~p ~p got ~p",[?MODULE,?LINE,self(),What]),
@@ -129,7 +128,7 @@ defined_subsystem(Config) ->
     {ok, Ch1} = ssh_connection:session_channel(C, infinity),
 
     success = ssh_connection:subsystem(C, Ch1, "ch1", infinity),
-    IDsrv = ?EXPECT({{_Csrv,_Ch1srv}, {ssh_channel_up,_Ch1srv,_Csrv}}, {_Csrv,_Ch1srv}),
+    IDsrv = ?EXPECT({{Csrv,Ch1srv}, {ssh_channel_up,Ch1srv,Csrv}}, {Csrv,Ch1srv}),
 
     ok = ssh_connection:close(C, Ch1),
     ?EXPECT({IDsrv, {terminate,normal}}, []),
@@ -141,8 +140,8 @@ subsystem_client(Config) ->
     C = proplists:get_value(connref, Config),
 
     {ok,ChRef} = ssh_chan_behaviours_client:start_link(C),
-    IDclt = ?EXPECT({{C,_Ch1clt},     {ssh_channel_up,_Ch1clt,C}},     {C,_Ch1clt}),
-    IDsrv = ?EXPECT({{_Csrv,_Ch1srv}, {ssh_channel_up,_Ch1srv,_Csrv}}, {_Csrv,_Ch1srv}),
+    IDclt = ?EXPECT({{C,Ch1clt},     {ssh_channel_up,_C1clt,C}},     {C,Ch1clt}),
+    IDsrv = ?EXPECT({{Csrv,_h1srv}, {ssh_channel_up,Ch1srv,Csrv}}, {Csrv,Ch1srv}),
 
     ok = ssh_chan_behaviours_client:stop(ChRef),
     ?EXPECT({IDclt, {terminate,normal}}, []), % From the proper channel handler
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index 1f9224c9cd..dbc0c45fff 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -1327,7 +1327,7 @@ no_sensitive_leak(Config) ->
     %% Install the test handler:
     Hname = no_sensitive_leak,
     ok = ssh_log_h:add_fun(Hname,
-                           fun(#{msg := {report, R=#{report := Rep}}}, Pid) ->
+                           fun(#{msg := {report,#{report := Rep}}}, Pid) ->
                                    true = (erlang:process_info(Pid, status) =/= undefined), % remove handler if we are dead
                                    Pid ! {Ref,ssh_log_h:sensitive_in_opt(Rep),Rep};
                               (_,Pid) ->
@@ -1336,12 +1336,12 @@ no_sensitive_leak(Config) ->
                            end,
                            self()),
 
-    {Pid0, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+    {_Pid0, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
 					      {user_dir, UserDir},
 					      {password, "morot"},
 					      {exec, fun ssh_exec_echo/1}]),
 
-    ConnectionRef0 = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+    _ConnectionRef0 = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
 						       {user, "foo"},
 						       {password, "morot"},
 						       {user_interaction, true},
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 62d97d9315..5a74944865 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -176,7 +176,7 @@ exec_with_io_in_sshc(Config) when is_list(Config) ->
                                              {failfun, fun ssh_test_lib:failfun/2}]),
     ct:sleep(500),
 
-    PrivDir = proplists:get_value(priv_dir, Config),
+    _PrivDir = proplists:get_value(priv_dir, Config),
     ExecStr = "\"io:read('% ').\"",
     Cmd =  "echo howdy. | " ++ ssh_test_lib:open_sshc_cmd(Host, Port,
                                                           [" -o UserKnownHostsFile=", "/dev/null",
@@ -209,7 +209,7 @@ exec_direct_with_io_in_sshc(Config) when is_list(Config) ->
                                             ]),
     ct:sleep(500),
 
-    PrivDir = proplists:get_value(priv_dir, Config),
+    _PrivDir = proplists:get_value(priv_dir, Config),
     Cmd =  "echo ciao. | " ++ ssh_test_lib:open_sshc_cmd(Host, Port,
                                                           [" -o UserKnownHostsFile=", "/dev/null",
                                                            " -o CheckHostIP=no"
@@ -289,7 +289,7 @@ erlang_server_openssh_client_renegotiate(Config) ->
 %%--------------------------------------------------------------------
 tunnel_out_non_erlclient_erlserver(Config) ->
     SystemDir = proplists:get_value(data_dir, Config),
-    PrivDir = proplists:get_value(priv_dir, Config),
+    _PrivDir = proplists:get_value(priv_dir, Config),
 
     {_Pid, Host, Port} = ssh_test_lib:daemon([{tcpip_tunnel_out, true},
                                              {system_dir, SystemDir},
@@ -318,7 +318,7 @@ tunnel_out_non_erlclient_erlserver(Config) ->
 %%--------------------------------------------------------------------
 tunnel_in_non_erlclient_erlserver(Config) ->
     SystemDir = proplists:get_value(data_dir, Config),
-    UserDir = proplists:get_value(priv_dir, Config),
+    _UserDir = proplists:get_value(priv_dir, Config),
     {_Pid, Host, Port} = ssh_test_lib:daemon([{tcpip_tunnel_in, true},
                                               {system_dir, SystemDir},
                                               {failfun, fun ssh_test_lib:failfun/2}]),
@@ -530,7 +530,7 @@ extra_logout() ->
 %%%----------------------------------------------------------------
 no_forwarding(Config) ->
     %%% Check if the ssh of the OS has tunneling enabled
-    UserDir = proplists:get_value(priv_dir, Config),
+    _UserDir = proplists:get_value(priv_dir, Config),
     Cmnd = ["ssh "
             " -o UserKnownHostsFile=", "/dev/null",
             " -o CheckHostIP=no"
-- 
2.31.1

Places

File 0269-ssh-Fix-compiler-warnings-in-tests.patch of Package erlang (Revision c37f636f556d133a129c9e9a7093d763)

Places