diff options
| author | Siri Hansen <[email protected]> | 2016-06-01 14:14:33 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-06-09 11:30:25 +0200 |
| commit | ce5f7b7e1842b1866c55e6f024c143c598709280 (patch) | |
| tree | 285934fa34e5048f472d20450b95f08f92e3ef89 /lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl | |
| parent | ad1a23350326f2c9a2c41d81b5dea776e1383999 (diff) | |
| download | otp-ce5f7b7e1842b1866c55e6f024c143c598709280.tar.gz otp-ce5f7b7e1842b1866c55e6f024c143c598709280.tar.bz2 otp-ce5f7b7e1842b1866c55e6f024c143c598709280.zip | |
[ct test] Check that crypto is loaded, or skip netconf tests
Tests for ct_netconfc are failed instead of skipped if crypto can not
be loaded. This is now corrected.
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 | 7 |
1 files changed, 4 insertions, 3 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 cddb07fad5..2aa6c4d354 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,8 +124,9 @@ end_per_testcase(_Case, _Config) -> ok. init_per_suite(Config) -> - case catch ssh:start() of - Ok when Ok==ok; Ok=={error,{already_started,ssh}} -> + (catch code:load_file(crypto)), + case {ssh:start(),code:is_loaded(crypto)} of + {Ok,{file,_}} when Ok==ok; Ok=={error,{already_started,ssh}} -> ct:log("ssh started",[]), SshDir = filename:join(filename:dirname(code:which(?MODULE)), "ssh_dir"), @@ -133,7 +134,7 @@ init_per_suite(Config) -> ct:log("netconf server started",[]), [{netconf_server,Server},{ssh_dir,SshDir}|Config]; Other -> - ct:log("could not start ssh: ~p",[Other]), + ct:log("could not start ssh or load crypto: ~p",[Other]), {skip, "SSH could not be started!"} end. |