diff options
| author | Siri Hansen <[email protected]> | 2014-02-24 12:41:58 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-02-24 12:41:58 +0100 |
| commit | e2896b5f3922b8397024aee8f541d46ba5cb0f1d (patch) | |
| tree | a14469ef59606b1cb4f9b9022ed3dc90c41eff40 /lib/sasl/test | |
| parent | 287a235b3e2d15bb047967263af5246362c5fdd4 (diff) | |
| parent | ae91a79057eaa48d93b182f285d122207c429753 (diff) | |
| download | otp-e2896b5f3922b8397024aee8f541d46ba5cb0f1d.tar.gz otp-e2896b5f3922b8397024aee8f541d46ba5cb0f1d.tar.bz2 otp-e2896b5f3922b8397024aee8f541d46ba5cb0f1d.zip | |
Merge branch 'siri/master-cuddle-with-tests'
* siri/master-cuddle-with-tests:
Use default timetrap (30 min) for kernel, stdlib and sasl app tests
Unload 'deadlock' application in application_SUITE:shutdown_deadlock
Diffstat (limited to 'lib/sasl/test')
| -rw-r--r-- | lib/sasl/test/sasl_SUITE.erl | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/sasl/test/sasl_SUITE.erl b/lib/sasl/test/sasl_SUITE.erl index ad63a31cbd..f4455f7e9b 100644 --- a/lib/sasl/test/sasl_SUITE.erl +++ b/lib/sasl/test/sasl_SUITE.erl @@ -19,10 +19,6 @@ -module(sasl_SUITE). -include_lib("common_test/include/ct.hrl"). - -%% Default timetrap timeout (set in init_per_testcase). --define(default_timeout, ?t:minutes(1)). - %% Test server specific exports -export([all/0,groups/0,init_per_group/2,end_per_group/2]). -export([init_per_testcase/2, end_per_testcase/2]). @@ -46,11 +42,8 @@ end_per_group(_GroupName, Config) -> init_per_testcase(_Case, Config) -> - 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. app_test(Config) when is_list(Config) -> |