From 2c0bd506cb99362635ebc0aafae36a95dc0a08b3 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Mon, 24 Jan 2011 13:33:13 +0100 Subject: Update init_per_suite so that tests are skipped if crypto/ssh cannot be started. --- lib/ssh/test/ssh_sftpd_SUITE.erl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl') diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index 263eeefe66..59445135b4 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -53,9 +53,16 @@ %% variable, but should NOT alter/remove any existing entries. %%-------------------------------------------------------------------- init_per_suite(Config) -> - ssh:stop(), - crypto:start(), - Config. + case {catch ssh:stop(),catch crypto:start()} of + {ok,ok} -> + 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) -> _ -- cgit v1.2.3