diff options
author | Siri Hansen <[email protected]> | 2014-02-21 16:15:08 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2014-02-21 17:06:22 +0100 |
commit | ae91a79057eaa48d93b182f285d122207c429753 (patch) | |
tree | 45db3ea08fa9e5accfe6512578d6d6c740fe7f57 /lib/stdlib/test/stdlib_SUITE.erl | |
parent | dba1f39502d0e711e6670f5f6e6073045f74a1ee (diff) | |
download | otp-ae91a79057eaa48d93b182f285d122207c429753.tar.gz otp-ae91a79057eaa48d93b182f285d122207c429753.tar.bz2 otp-ae91a79057eaa48d93b182f285d122207c429753.zip |
Use default timetrap (30 min) for kernel, stdlib and sasl app tests
These tests start new nodes, and they frequently timed out on some
slow test hosts.
Diffstat (limited to 'lib/stdlib/test/stdlib_SUITE.erl')
-rw-r--r-- | lib/stdlib/test/stdlib_SUITE.erl | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/stdlib/test/stdlib_SUITE.erl b/lib/stdlib/test/stdlib_SUITE.erl index b0d6913636..53a34511d9 100644 --- a/lib/stdlib/test/stdlib_SUITE.erl +++ b/lib/stdlib/test/stdlib_SUITE.erl @@ -23,9 +23,6 @@ -include_lib("test_server/include/test_server.hrl"). -% Default timetrap timeout (set in init_per_testcase). --define(default_timeout, ?t:minutes(1)). - % Test server specific exports -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]). @@ -59,11 +56,8 @@ end_per_group(_GroupName, Config) -> init_per_testcase(_Case, Config) -> - ?line Dog=test_server:timetrap(?default_timeout), - [{watchdog, Dog}|Config]. -end_per_testcase(_Case, Config) -> - Dog=?config(watchdog, Config), - test_server:timetrap_cancel(Dog), + Config. +end_per_testcase(_Case, _Config) -> ok. % |