diff options
| author | Siri Hansen <[email protected]> | 2017-05-09 15:33:57 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-05-09 15:33:57 +0200 |
| commit | 55086871a95f7ac518fc7e5a8e626f4f9b84e096 (patch) | |
| tree | 48fc2faadf1a1db48c2b5d67ff4be3c84c40dfdd /lib/common_test/test/ct_netconfc_SUITE.erl | |
| parent | c58f2e9484e34fee022dc71df0dce8f05034225f (diff) | |
| parent | fe521f4679ed0caa068f3825869796001b29fc40 (diff) | |
| download | otp-55086871a95f7ac518fc7e5a8e626f4f9b84e096.tar.gz otp-55086871a95f7ac518fc7e5a8e626f4f9b84e096.tar.bz2 otp-55086871a95f7ac518fc7e5a8e626f4f9b84e096.zip | |
Merge branch 'siri/ct_netconfc/multiple-channels/OTP-14284'
* siri/ct_netconfc/multiple-channels/OTP-14284:
[ct_netconfc] Update documentation
[ct_netconfc] Start multiple sessions per SSH connection
Diffstat (limited to 'lib/common_test/test/ct_netconfc_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_netconfc_SUITE.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/common_test/test/ct_netconfc_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE.erl index 8932f930d1..05edb45fe8 100644 --- a/lib/common_test/test/ct_netconfc_SUITE.erl +++ b/lib/common_test/test/ct_netconfc_SUITE.erl @@ -52,9 +52,8 @@ init_per_suite(Config) -> end. check_crypto_and_ssh() -> - (catch code:load_file(crypto)), - case code:is_loaded(crypto) of - {file,_} -> + case code:ensure_loaded(crypto) of + {module,_} -> case catch ssh:start() of Ok when Ok==ok; Ok=={error,{already_started,ssh}} -> ct:log("ssh started",[]), |