aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2013-06-24 10:15:12 +0200
committerIngela Anderton Andin <ingela@erlang.org>2013-06-24 10:15:12 +0200
commit4c3b306184d886678d08949bcbe0186af8f984b1 (patch)
tree6bba510907326f42d11bc94f501dbfc3cb18d6c3
parent5d8a13bb6a180e0a20fb008139f8c1088bcf9fda (diff)
parent26223d30ba7d927937dabb24c6005980b5ad7f82 (diff)
downloadotp-4c3b306184d886678d08949bcbe0186af8f984b1.tar.gz
otp-4c3b306184d886678d08949bcbe0186af8f984b1.tar.bz2
otp-4c3b306184d886678d08949bcbe0186af8f984b1.zip
Merge branch 'ia/public_key/test-independency' into maint
* ia/public_key/test-independency: public_key: Make test cases independent of failure of other test cases to clean up.
-rw-r--r--lib/public_key/test/pbe_SUITE.erl1
-rw-r--r--lib/public_key/test/pkits_SUITE.erl1
-rw-r--r--lib/public_key/test/public_key_SUITE.erl1
3 files changed, 3 insertions, 0 deletions
diff --git a/lib/public_key/test/pbe_SUITE.erl b/lib/public_key/test/pbe_SUITE.erl
index 254601b107..2c9b17478d 100644
--- a/lib/public_key/test/pbe_SUITE.erl
+++ b/lib/public_key/test/pbe_SUITE.erl
@@ -42,6 +42,7 @@ groups() ->
%%--------------------------------------------------------------------
init_per_suite(Config) ->
+ application:stop(crypto),
try crypto:start() of
ok ->
Config
diff --git a/lib/public_key/test/pkits_SUITE.erl b/lib/public_key/test/pkits_SUITE.erl
index 9180fa968b..699481b20f 100644
--- a/lib/public_key/test/pkits_SUITE.erl
+++ b/lib/public_key/test/pkits_SUITE.erl
@@ -111,6 +111,7 @@ groups() ->
%%--------------------------------------------------------------------
init_per_suite(Config) ->
+ application:stop(crypto),
try crypto:start() of
ok ->
application:start(asn1),
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index f2596e3d85..c3aa2e2366 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -56,6 +56,7 @@ groups() ->
].
%%-------------------------------------------------------------------
init_per_suite(Config) ->
+ application:stop(crypto),
try crypto:start() of
ok ->
application:start(asn1),