From dba1f39502d0e711e6670f5f6e6073045f74a1ee Mon Sep 17 00:00:00 2001 From: Siri Hansen Date: Fri, 21 Feb 2014 15:27:56 +0100 Subject: Unload 'deadlock' application in application_SUITE:shutdown_deadlock This is just to clean up properly after the test case. If not, code_SUITE:bit_boot_embedded might fail since it tries to include the 'deadlock' application in the boot file and fails when running systools:make_script. --- lib/kernel/test/application_SUITE.erl | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/kernel/test') diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl index ccb3760309..c6cbd1a0ef 100644 --- a/lib/kernel/test/application_SUITE.erl +++ b/lib/kernel/test/application_SUITE.erl @@ -2121,6 +2121,7 @@ shutdown_deadlock(Config) when is_list(Config) -> Server ! continue end, [_|_] = application:which_applications(), + application:unload(deadlock), % clean up! ok. -- cgit v1.2.3 From ae91a79057eaa48d93b182f285d122207c429753 Mon Sep 17 00:00:00 2001 From: Siri Hansen Date: Fri, 21 Feb 2014 16:15:08 +0100 Subject: 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. --- lib/kernel/test/kernel_SUITE.erl | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'lib/kernel/test') diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl index 2d8123c9c4..78f5e93fc3 100644 --- a/lib/kernel/test/kernel_SUITE.erl +++ b/lib/kernel/test/kernel_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. % -- cgit v1.2.3