aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-06-17 09:46:02 +0200
committerSiri Hansen <[email protected]>2016-06-18 15:35:28 +0200
commite61d7eb7ed8a1425daf8948ae0ba882cebc4946f (patch)
tree0da6d00fa38f5d3a7c92e8b51f91daea27af68cb /lib
parent7176e321c085cbcdd044f2dfc2b02bbba2c50e7b (diff)
downloadotp-e61d7eb7ed8a1425daf8948ae0ba882cebc4946f.tar.gz
otp-e61d7eb7ed8a1425daf8948ae0ba882cebc4946f.tar.bz2
otp-e61d7eb7ed8a1425daf8948ae0ba882cebc4946f.zip
[ct test] Catch call to ssh:start/0
The ssh application is not installed on all test hosts. Catching the call to ssh:start/0 allows the the netconf tests to be nicely skipped if ssh does not exist.
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/test/ct_netconfc_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_netconfc_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE.erl
index 2919f01605..8932f930d1 100644
--- a/lib/common_test/test/ct_netconfc_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE.erl
@@ -55,7 +55,7 @@ check_crypto_and_ssh() ->
(catch code:load_file(crypto)),
case code:is_loaded(crypto) of
{file,_} ->
- case ssh:start() of
+ case catch ssh:start() of
Ok when Ok==ok; Ok=={error,{already_started,ssh}} ->
ct:log("ssh started",[]),
ok;