diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-04-04 09:50:40 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-04-04 09:50:40 +0200 |
| commit | eeb8957e485c27ab70f4ba056cfebfff412ec055 (patch) | |
| tree | 7bdf174079327efb6df962a57ed92ab17c859eee /lib/inets/test/ftp_SUITE.erl | |
| parent | d26bd8c3ecafe9a3cc0a892445fe1e3157c273a8 (diff) | |
| parent | 8ebf838c8391c5b373f82acdfa3b60245cab2de7 (diff) | |
| download | otp-eeb8957e485c27ab70f4ba056cfebfff412ec055.tar.gz otp-eeb8957e485c27ab70f4ba056cfebfff412ec055.tar.bz2 otp-eeb8957e485c27ab70f4ba056cfebfff412ec055.zip | |
Merge branch 'ingela/inets/tests-cuddle'
* ingela/inets/tests-cuddle:
inets: Do not test https/ftps if crypto can not start
Diffstat (limited to 'lib/inets/test/ftp_SUITE.erl')
| -rw-r--r-- | lib/inets/test/ftp_SUITE.erl | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/lib/inets/test/ftp_SUITE.erl b/lib/inets/test/ftp_SUITE.erl index e2dec0c42a..0f1fa96c67 100644 --- a/lib/inets/test/ftp_SUITE.erl +++ b/lib/inets/test/ftp_SUITE.erl @@ -191,9 +191,22 @@ end_per_suite(Config) -> ok. %%-------------------------------------------------------------------- -init_per_group(_Group, Config) -> Config. - -end_per_group(_Group, Config) -> Config. +init_per_group(Group, Config) when Group == ftps_active, + Group == ftps_passive -> + catch crypto:stop(), + try crypto:start() of + ok -> + Config + catch + _:_ -> + {skip, "Crypto did not start"} + end; + +init_per_group(_Group, Config) -> + Config. + +end_per_group(_Group, Config) -> + Config. %%-------------------------------------------------------------------- init_per_testcase(Case, Config0) -> |