diff options
| author | Dan Gudmundsson <[email protected]> | 2012-10-03 10:48:30 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-10-30 16:13:14 +0100 |
| commit | ba2f96b118d80db32bbe192751309c6aa3342373 (patch) | |
| tree | 39351b8e7317d12cb5cc7b244aaca657bf1d5780 /lib/stdlib/test | |
| parent | 78dfecc0eff5cdba9c84c55f250fdf6e9dfd6f32 (diff) | |
| download | otp-ba2f96b118d80db32bbe192751309c6aa3342373.tar.gz otp-ba2f96b118d80db32bbe192751309c6aa3342373.tar.bz2 otp-ba2f96b118d80db32bbe192751309c6aa3342373.zip | |
stdlib: Fix test timeouts in cover runs
Diffstat (limited to 'lib/stdlib/test')
| -rw-r--r-- | lib/stdlib/test/base64_SUITE.erl | 5 | ||||
| -rw-r--r-- | lib/stdlib/test/gen_server_SUITE.erl | 3 |
2 files changed, 4 insertions, 4 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]), |