diff options
author | Siri Hansen <[email protected]> | 2013-01-23 16:28:19 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2013-01-23 16:28:19 +0100 |
commit | f5170af4a992d6de5cd84da9cc4db4b4e073de32 (patch) | |
tree | b7552d19bfe301a10e23ff031a2c30b0ea5655ab /lib/common_test/test/ct_netconfc_SUITE.erl | |
parent | d0809964a228c6314a5bb8b5872114a0ab9ec65e (diff) | |
parent | 4aa7be58e6c1e7031042e7ea7b008de1cf4c0ad6 (diff) | |
download | otp-f5170af4a992d6de5cd84da9cc4db4b4e073de32.tar.gz otp-f5170af4a992d6de5cd84da9cc4db4b4e073de32.tar.bz2 otp-f5170af4a992d6de5cd84da9cc4db4b4e073de32.zip |
Merge branch 'siri/common_test/minor_test_fixes/OTP-10483'
* siri/common_test/minor_test_fixes/OTP-10483:
[common_test] Extend timetrap time in ct_hooks_SUITE
[common_test] Avoid hanging ct@host node if crypto does not exist
[common_test] Changed call to publick_key to use documented interface
[common_test] Extend timeout values for slave nodes in ct_master_SUITE
[common_test] Extend valid interval for approximate timer values in tests
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 3042a924fe..c89a4cdabe 100644 --- a/lib/common_test/test/ct_netconfc_SUITE.erl +++ b/lib/common_test/test/ct_netconfc_SUITE.erl @@ -43,12 +43,11 @@ %% there will be clashes with logging processes etc). %%-------------------------------------------------------------------- init_per_suite(Config) -> - Config1 = ct_test_support:init_per_suite(Config), case application:load(crypto) of - {error,Reason} -> + {error,Reason} when Reason=/={already_loaded,crypto} -> {skip, Reason}; _ -> - Config1 + ct_test_support:init_per_suite(Config) end. end_per_suite(Config) -> |