aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-06-07 11:53:31 +0200
committerHans Nilsson <[email protected]>2016-06-07 11:53:31 +0200
commitb3fd5bc5c14407335d77e44f3f936e465ad091fb (patch)
tree423f993ad13d6895a22a729fc79ee235e4887392 /lib
parent5b0547269daacd1d7c25dfc060cd309c3d89f279 (diff)
parent8a27310537c01fb2e8fc7f084d114fc1125b7ed2 (diff)
downloadotp-b3fd5bc5c14407335d77e44f3f936e465ad091fb.tar.gz
otp-b3fd5bc5c14407335d77e44f3f936e465ad091fb.tar.bz2
otp-b3fd5bc5c14407335d77e44f3f936e465ad091fb.zip
Merge branch 'hans/eldap/cuddle_tests'
Diffstat (limited to 'lib')
-rw-r--r--lib/eldap/test/eldap_basic_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/eldap/test/eldap_basic_SUITE.erl b/lib/eldap/test/eldap_basic_SUITE.erl
index d52a7c83f7..ac3447cfe6 100644
--- a/lib/eldap/test/eldap_basic_SUITE.erl
+++ b/lib/eldap/test/eldap_basic_SUITE.erl
@@ -32,7 +32,7 @@
-define(manageDsaIT, {control,"2.16.840.1.113730.3.4.2",false,asn1_NOVALUE}).
suite() ->
- [{timetrap,{seconds,40}}].
+ [{timetrap,{seconds,360}}].
all() ->
[app,