aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2013-02-21 14:04:15 +0100
committerPeter Andersson <[email protected]>2013-02-21 14:04:15 +0100
commitb0db6381f30029f6dba03290a02129dde672b88a (patch)
treec36c72f0e5e70149f9e7c1f27378d8164f70b90f
parent565b4a4065229c0c9ea08a758be3a2c228514883 (diff)
parent4b6c8cc7ab83f136e484716eb9696f703fdf611d (diff)
downloadotp-b0db6381f30029f6dba03290a02129dde672b88a.tar.gz
otp-b0db6381f30029f6dba03290a02129dde672b88a.tar.bz2
otp-b0db6381f30029f6dba03290a02129dde672b88a.zip
Merge branch 'peppe/common_test/increase_timetraps'
* peppe/common_test/increase_timetraps: Increase timetrap times in ct_verbosity_SUITE
-rw-r--r--lib/common_test/test/ct_verbosity_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_verbosity_SUITE.erl b/lib/common_test/test/ct_verbosity_SUITE.erl
index 198d4c44b5..ff4c05ce3a 100644
--- a/lib/common_test/test/ct_verbosity_SUITE.erl
+++ b/lib/common_test/test/ct_verbosity_SUITE.erl
@@ -59,7 +59,7 @@ init_per_testcase(TestCase, Config) ->
end_per_testcase(TestCase, Config) ->
ct_test_support:end_per_testcase(TestCase, Config).
-suite() -> [{timetrap,{seconds,30}},
+suite() -> [{timetrap,{minutes,2}},
{ct_hooks,[ts_install_cth]}].
all() ->