aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-11-09 15:33:58 +0100
committerIngela Anderton Andin <[email protected]>2016-11-09 15:33:58 +0100
commitbbdba69b905f87d95257a65d902fc09c25f0be4a (patch)
treec2d5aea5ba14f7a9120f20cebfcb6f4511a5bb72 /lib
parent2bc52f6dd31d114b1a2d3cb7ad0a12b0b209beff (diff)
parent35ccc685984fc435a49e4a8b0228136b47a5095a (diff)
downloadotp-bbdba69b905f87d95257a65d902fc09c25f0be4a.tar.gz
otp-bbdba69b905f87d95257a65d902fc09c25f0be4a.tar.bz2
otp-bbdba69b905f87d95257a65d902fc09c25f0be4a.zip
Merge branch 'ingela/ssl/tune-timeouts-packet_SUITE' into maint
* ingela/ssl/tune-timeouts-packet_SUITE: ssl: Change to more modest timeouts
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/test/ssl_packet_SUITE.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl
index 942e68967a..3446a566c4 100644
--- a/lib/ssl/test/ssl_packet_SUITE.erl
+++ b/lib/ssl/test/ssl_packet_SUITE.erl
@@ -41,9 +41,9 @@
-define(MANY, 1000).
-define(SOME, 50).
--define(BASE_TIMEOUT_SECONDS, 30).
--define(SOME_SCALE, 20).
--define(MANY_SCALE, 20).
+-define(BASE_TIMEOUT_SECONDS, 5).
+-define(SOME_SCALE, 2).
+-define(MANY_SCALE, 3).
%%--------------------------------------------------------------------
%% Common Test interface functions -----------------------------------