diff options
| author | Dan Gudmundsson <[email protected]> | 2012-10-30 16:14:21 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-10-30 16:14:21 +0100 |
| commit | f4003ae4ff6c53bdcffb4638eeb36ec737d8bdd2 (patch) | |
| tree | 1ac379e674a144c1c54d23c2ac1c5e0c9eb8f24d /lib/stdlib | |
| parent | a8b2ba096dc48a29af52fd68070089d4bbb37483 (diff) | |
| parent | f17020af337cf34560e939d822229262a214f28d (diff) | |
| download | otp-f4003ae4ff6c53bdcffb4638eeb36ec737d8bdd2.tar.gz otp-f4003ae4ff6c53bdcffb4638eeb36ec737d8bdd2.tar.bz2 otp-f4003ae4ff6c53bdcffb4638eeb36ec737d8bdd2.zip | |
Merge branch 'dgud/test-fixes'
* dgud/test-fixes:
test: fix timetraps
kernel: Extend test timeout for cover tests
stdlib: Fix test timeouts in cover runs
runtime_tools: Fix failing testcase
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/test/base64_SUITE.erl | 5 | ||||
| -rw-r--r-- | lib/stdlib/test/gen_server_SUITE.erl | 3 | ||||
| -rw-r--r-- | lib/stdlib/test/id_transform_SUITE.erl | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/stdlib/test/base64_SUITE.erl b/lib/stdlib/test/base64_SUITE.erl index c64a961ffa..7b8650f224 100644 --- a/lib/stdlib/test/base64_SUITE.erl +++ b/lib/stdlib/test/base64_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2011. All Rights Reserved. +%% Copyright Ericsson AB 2007-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -20,7 +20,6 @@ -module(base64_SUITE). -include_lib("common_test/include/ct.hrl"). --include("test_server_line.hrl"). %% Test server specific exports -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, @@ -33,7 +32,7 @@ mime_decode_to_string/1, roundtrip/1]). init_per_testcase(_, Config) -> - Dog = test_server:timetrap(?t:minutes(2)), + Dog = test_server:timetrap(?t:minutes(4)), NewConfig = lists:keydelete(watchdog, 1, Config), [{watchdog, Dog} | NewConfig]. diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl index 2abb01ba24..dffeadb423 100644 --- a/lib/stdlib/test/gen_server_SUITE.erl +++ b/lib/stdlib/test/gen_server_SUITE.erl @@ -1046,8 +1046,9 @@ call_with_huge_message_queue(Config) when is_list(Config) -> io:format("Time for empty message queue: ~p", [Time]), io:format("Time for huge message queue: ~p", [NewTime]), + IsCover = test_server:is_cover(), case (NewTime+1) / (Time+1) of - Q when Q < 10 -> + Q when Q < 10; IsCover -> ok; Q -> io:format("Q = ~p", [Q]), diff --git a/lib/stdlib/test/id_transform_SUITE.erl b/lib/stdlib/test/id_transform_SUITE.erl index 233b0d0a78..ee97ffe7b3 100644 --- a/lib/stdlib/test/id_transform_SUITE.erl +++ b/lib/stdlib/test/id_transform_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2011. All Rights Reserved. +%% Copyright Ericsson AB 2003-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -61,7 +61,7 @@ id_transform(Config) when is_list(Config) -> ?line {module,erl_id_trans}=code:load_binary(erl_id_trans,File,Bin), ?line case test_server:purify_is_running() of false -> - Dog = ?t:timetrap(?t:hours(1)), + Dog = ct:timetrap(?t:hours(1)), ?line Res = run_in_test_suite(), ?t:timetrap_cancel(Dog), Res; |