diff options
| author | Siri Hansen <[email protected]> | 2016-03-30 11:13:38 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-03-30 15:29:27 +0200 |
| commit | 47cdb0899302e61dfe4ea392a10e4cc995183332 (patch) | |
| tree | 698081937f8456272f925254b49c6fbc0c1a3332 /lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl | |
| parent | 303ccb07dbc4a6d3729017dc9d175a2ec9636ae3 (diff) | |
| download | otp-47cdb0899302e61dfe4ea392a10e4cc995183332.tar.gz otp-47cdb0899302e61dfe4ea392a10e4cc995183332.tar.bz2 otp-47cdb0899302e61dfe4ea392a10e4cc995183332.zip | |
Improve error control when starting ssh in netconf test
Diffstat (limited to 'lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl index 9d4c798795..f23fb9154a 100644 --- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl +++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl @@ -124,14 +124,18 @@ end_per_testcase(_Case, _Config) -> ok. init_per_suite(Config) -> - case catch {crypto:start(), ssh:start()} of - {ok, ok} -> + case catch ssh:start() of + Ok when Ok==ok; Ok=={error,{already_started,ssh}} -> + ct:log("ssh started",[]), {ok, _} = netconfc_test_lib:get_id_keys(Config), netconfc_test_lib:make_dsa_files(Config), + ct:log("dsa files created",[]), Server = ?NS:start(?config(data_dir,Config)), + ct:log("netconf server started",[]), [{server,Server}|Config]; - _ -> - {skip, "Crypto and/or SSH could not be started!"} + Other -> + ct:log("could not start ssh: ~p",[Other]), + {skip, "SSH could not be started!"} end. end_per_suite(Config) -> |