diff options
author | Siri Hansen <siri@erlang.org> | 2016-03-30 15:29:33 +0200 |
---|---|---|
committer | Siri Hansen <siri@erlang.org> | 2016-03-30 15:29:33 +0200 |
commit | 86b3aeafa32546d8aa343e0574ce64ab378da08d (patch) | |
tree | 9a129ed4db28a321fefd771b973e39294318f243 | |
parent | 47cdb0899302e61dfe4ea392a10e4cc995183332 (diff) | |
download | otp-86b3aeafa32546d8aa343e0574ce64ab378da08d.tar.gz otp-86b3aeafa32546d8aa343e0574ce64ab378da08d.tar.bz2 otp-86b3aeafa32546d8aa343e0574ce64ab378da08d.zip |
Check that ssh application exists before starting netconf tests
On some test machines, crypto or ssh applications do not
exist. ct_netconfc_SUITE only checked for crypto, causing failed
instead of skipped test case when ssh does not exist.
-rw-r--r-- | lib/common_test/test/ct_netconfc_SUITE.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_netconfc_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE.erl index af215b72b7..cabb35c78a 100644 --- a/lib/common_test/test/ct_netconfc_SUITE.erl +++ b/lib/common_test/test/ct_netconfc_SUITE.erl @@ -48,7 +48,12 @@ init_per_suite(Config) -> {error,Reason} when Reason=/={already_loaded,crypto} -> {skip, Reason}; _ -> - ct_test_support:init_per_suite(Config) + case application:load(ssh) of + {error,Reason} when Reason=/={already_loaded,ssh} -> + {skip, Reason}; + _ -> + ct_test_support:init_per_suite(Config) + end end. end_per_suite(Config) -> |