diff options
| author | Siri Hansen <[email protected]> | 2012-12-14 11:26:03 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-12-14 11:26:03 +0100 |
| commit | e1f1d22a72bab14fe4e8a3443cbef298764c001e (patch) | |
| tree | 8afe4f4ee1d13987667f4f365a49e86b28059cc1 | |
| parent | f044676419eea2f77f81ccd718ea67524fac03c6 (diff) | |
| download | otp-e1f1d22a72bab14fe4e8a3443cbef298764c001e.tar.gz otp-e1f1d22a72bab14fe4e8a3443cbef298764c001e.tar.bz2 otp-e1f1d22a72bab14fe4e8a3443cbef298764c001e.zip | |
[common_test] Avoid hanging ct@host node if crypto does not exist
ct_netconfc:init_per_suite called ct_test_support:init_per_suite
before checking if crypto exists. This caused the slave node (ct@host)
to be started even though the suite would be skipped when crypto did
not exist - which in turn caused a hanging ct node since end_per_suite
is not run in a skipped suite. This has been corrected.
| -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) -> |