aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-01-24 13:33:13 +0100
committerNiclas Eklund <[email protected]>2011-05-19 14:38:14 +0200
commit2c0bd506cb99362635ebc0aafae36a95dc0a08b3 (patch)
treea354114b9ef64e9f71c1c6eac150d181793f07ca /lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
parent694eba4f53b5a1f07b5d37cbe4112fdd1e403a27 (diff)
downloadotp-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_sftpd_erlclient_SUITE.erl')
-rw-r--r--lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl25
1 files changed, 14 insertions, 11 deletions
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
index 7e9b6024e5..6ad462deab 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
@@ -44,17 +44,20 @@
%% variable, but should NOT alter/remove any existing entries.
%%--------------------------------------------------------------------
init_per_suite(Config) ->
- ssh:stop(),
- crypto:start(),
- DataDir = ?config(data_dir, Config),
- FileAlt = filename:join(DataDir, "ssh_sftpd_file_alt.erl"),
- c:c(FileAlt),
- FileName = filename:join(DataDir, "test.txt"),
- {ok, FileInfo} = file:read_file_info(FileName),
- ok = file:write_file_info(FileName,
- FileInfo#file_info{mode = 8#400}),
-
- Config.
+ catch ssh:stop(),
+ case catch crypto:start() of
+ ok ->
+ DataDir = ?config(data_dir, Config),
+ FileAlt = filename:join(DataDir, "ssh_sftpd_file_alt.erl"),
+ c:c(FileAlt),
+ FileName = filename:join(DataDir, "test.txt"),
+ {ok, FileInfo} = file:read_file_info(FileName),
+ ok = file:write_file_info(FileName,
+ FileInfo#file_info{mode = 8#400}),
+ Config;
+ _Else ->
+ {skip,"Could not start ssh!"}
+ end.
%%--------------------------------------------------------------------
%% Function: end_per_suite(Config) -> _