aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-03-20 13:11:17 +0100
committerBjörn Gustavsson <[email protected]>2014-03-20 13:11:17 +0100
commitb6ee065ba92fe7505674385923a2d6517f0af304 (patch)
tree7c172906caeb4d2d2dc3ad98c1d628a66c1e5a1e /lib/stdlib
parentccd7ac51b630b985fc9cf50124e69c70bdb07982 (diff)
parent651d8b9ab88b4bad73d37f3696b8d3cf0970a80d (diff)
downloadotp-b6ee065ba92fe7505674385923a2d6517f0af304.tar.gz
otp-b6ee065ba92fe7505674385923a2d6517f0af304.tar.bz2
otp-b6ee065ba92fe7505674385923a2d6517f0af304.zip
Merge branch 'bjorn/cuddle-with-tests'
* bjorn/cuddle-with-tests: cover_SUITE:reconnect/1: Let the other side initiate the disconnect Attempt to provide more information if a test case fails prim_file_SUITE: Remove the short 5 seconds timetrap timeout shell_SUITE: Give bs_match_bin_SUITE/1 more time
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/test/shell_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 692dfe0faa..e016432f4d 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -54,7 +54,7 @@ config(priv_dir,_) ->
-include_lib("test_server/include/test_server.hrl").
-export([init_per_testcase/2, end_per_testcase/2]).
% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(2)).
+-define(default_timeout, ?t:minutes(10)).
init_per_testcase(_Case, Config) ->
?line Dog = ?t:timetrap(?default_timeout),
?line OrigPath = code:get_path(),