diff options
| author | Lukas Larsson <[email protected]> | 2011-01-24 13:33:13 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-05-19 14:38:14 +0200 |
| commit | 2c0bd506cb99362635ebc0aafae36a95dc0a08b3 (patch) | |
| tree | a354114b9ef64e9f71c1c6eac150d181793f07ca /lib/ssh/test/ssh_sftp_SUITE.erl | |
| parent | 694eba4f53b5a1f07b5d37cbe4112fdd1e403a27 (diff) | |
| download | otp-2c0bd506cb99362635ebc0aafae36a95dc0a08b3.tar.gz otp-2c0bd506cb99362635ebc0aafae36a95dc0a08b3.tar.bz2 otp-2c0bd506cb99362635ebc0aafae36a95dc0a08b3.zip | |
Update init_per_suite so that tests are skipped if crypto/ssh cannot be started.
Diffstat (limited to 'lib/ssh/test/ssh_sftp_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_sftp_SUITE.erl | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl index 4cc157ebd4..ec2010e15a 100644 --- a/lib/ssh/test/ssh_sftp_SUITE.erl +++ b/lib/ssh/test/ssh_sftp_SUITE.erl @@ -46,13 +46,21 @@ %% variable, but should NOT alter/remove any existing entries. %%-------------------------------------------------------------------- init_per_suite(Config) -> - crypto:start(), - ssh:start(), - Dir = ?config(priv_dir, Config), - ssh_test_lib:save_known_hosts(Dir), - %% More like copy_id_keys!!! - {ok, _} = ssh_test_lib:get_id_keys(Dir), - Config. + case {catch crypto:start(),catch ssh:start()} of + {ok,ok} -> + Dir = ?config(priv_dir, Config), + ssh_test_lib:save_known_hosts(Dir), + %% More like copy_id_keys!!! + {ok, _} = ssh_test_lib:get_id_keys(Dir), + Config; + {ok,_} -> + {skip,"Could not start ssh!"}; + {_,ok} -> + {skip,"Could not start crypto!"}; + {_,_} -> + {skip,"Could not start crypto and ssh!"} + end. + %%-------------------------------------------------------------------- %% Function: end_per_suite(Config) -> _ %% Config - [tuple()] |