aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-04-27 09:56:02 +0200
committerHans Nilsson <[email protected]>2018-04-27 09:56:02 +0200
commit1c0faa63188242378e225d2a90cb2003f8928e1f (patch)
tree00b8471fcf9fd501b72c487eba2da679fff9f22a /lib/ssh
parentac70945ef36467783399574a2a73ad93ad9cc3dd (diff)
parent1e2c6ae584f82b984af382de4d8290366e96c63c (diff)
downloadotp-1c0faa63188242378e225d2a90cb2003f8928e1f.tar.gz
otp-1c0faa63188242378e225d2a90cb2003f8928e1f.tar.bz2
otp-1c0faa63188242378e225d2a90cb2003f8928e1f.zip
Merge branch 'hans/ssh/cuddle_tests'
* hans/ssh/cuddle_tests: ssh: Test case fix The daemon kill is now so fast that the clients does not react fast enough in ssh_sup_SUITE:killed_acceptor_restarts/1
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/test/ssh_sup_SUITE.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl
index b145066c36..4e7169d927 100644
--- a/lib/ssh/test/ssh_sup_SUITE.erl
+++ b/lib/ssh/test/ssh_sup_SUITE.erl
@@ -256,8 +256,8 @@ killed_acceptor_restarts(Config) ->
ok = ssh:stop_daemon(DaemonPid),
?wait_match(undefined, process_info(DaemonPid), 1000, 30),
- {error,closed} = ssh:connection_info(C1,[client_version]),
- {error,closed} = ssh:connection_info(C2,[client_version]).
+ ?wait_match({error,closed}, ssh:connection_info(C1,[client_version]), 1000, 5),
+ ?wait_match({error,closed}, ssh:connection_info(C2,[client_version]), 1000, 5).
%%-------------------------------------------------------------------------
shell_channel_tree(Config) ->