aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2012-10-03 14:34:10 +0200
committerDan Gudmundsson <[email protected]>2012-10-30 16:13:15 +0100
commitf17020af337cf34560e939d822229262a214f28d (patch)
tree1ac379e674a144c1c54d23c2ac1c5e0c9eb8f24d /lib/stdlib
parent1b6a0cab33fa0b34c5e28820c6ddc4e18b0111fa (diff)
downloadotp-f17020af337cf34560e939d822229262a214f28d.tar.gz
otp-f17020af337cf34560e939d822229262a214f28d.tar.bz2
otp-f17020af337cf34560e939d822229262a214f28d.zip
test: fix timetraps
Use ct:timetrap/1 instead of test_server:timetrap/1 for really long test_cases. Commontest sets up a default timetrap on 30 min, which is not cancelled if testserver:timetrap called.
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/test/id_transform_SUITE.erl4
1 files changed, 2 insertions, 2 deletions
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;