aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2014-03-19 16:46:24 +0100
committerPeter Andersson <[email protected]>2014-03-19 16:46:24 +0100
commitb5969a04fe4161311e2006af5351155b18e50eca (patch)
tree946c28b8d81a491f2b526f1b4f0b32731dffc75b /lib/common_test
parent57a9bc4c710690d1c7b219a9cd53b8cecbe6851e (diff)
downloadotp-b5969a04fe4161311e2006af5351155b18e50eca.tar.gz
otp-b5969a04fe4161311e2006af5351155b18e50eca.tar.bz2
otp-b5969a04fe4161311e2006af5351155b18e50eca.zip
Shorten default timetrap timeout for ct_master test suite
Diffstat (limited to 'lib/common_test')
-rw-r--r--lib/common_test/test/ct_master_SUITE.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_master_SUITE.erl b/lib/common_test/test/ct_master_SUITE.erl
index 7408cbe376..e90513f888 100644
--- a/lib/common_test/test/ct_master_SUITE.erl
+++ b/lib/common_test/test/ct_master_SUITE.erl
@@ -81,7 +81,8 @@ end_per_testcase(TestCase, Config) ->
ct_test_support:end_per_testcase(TestCase, Config).
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() -> [{timetrap,{seconds,60}},
+ {ct_hooks,[ts_install_cth]}].
all() ->
[ct_master_test].