Merge branch 'hans/ssh/test_fixes/OTP-13854' into maint

Fixes problems found by test suites as well as by Codenomicon/Defensics:
  - reduce max random padding to 15 bytes (Codenomicon/Defensics)
  - inclomplete pdu handling (Codenomicon/Defensics)
  - badmatch
  - non-blocking send fixes deadlock in ssh_connection_SUITE:interrupted_send

1 files changed, 8 insertions, 10 deletions

diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 0f68130a05..8b2db0e1a8 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -180,21 +180,19 @@ simple_exec(Config) ->
 %%--------------------------------------------------------------------
 %% Testing if no group matches
 simple_exec_groups_no_match_too_small(Config) ->
-    try simple_exec_group({400,500,600}, Config)
-    of
-	_ -> ct:fail("Exec though no group available")
-    catch
-	error:{badmatch,{error,"No possible diffie-hellman-group-exchange group found"}} ->
-	    ok
-    end.
+    try_exec_simple_group({400,500,600}, Config).
 
 simple_exec_groups_no_match_too_large(Config) ->
-    try simple_exec_group({9200,9500,9700}, Config)
+    try_exec_simple_group({9200,9500,9700}, Config).
+
+
+try_exec_simple_group(Group, Config) ->
+    try simple_exec_group(Group, Config)
     of
 	_ -> ct:fail("Exec though no group available")
     catch
-	error:{badmatch,{error,"No possible diffie-hellman-group-exchange group found"}} ->
-	    ok
+	error:{badmatch,{error,"No possible diffie-hellman-group-exchange group found"}} -> ok;
+	error:{badmatch,{error,"Connection closed"}} -> ok
     end.
 
 %%--------------------------------------------------------------------