aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2011-04-19 23:25:12 +0200
committerPeter Andersson <[email protected]>2011-04-28 22:45:58 +0200
commit0197acace48c17dcb500b7bdb10d2cc1cbaa848e (patch)
treedb8cbd8253a578c70eacb1001964b449cc2e9e53 /lib/common_test/src/ct.erl
parent0634077b636eb0c879e1f71ba78ea1565b6617b2 (diff)
downloadotp-0197acace48c17dcb500b7bdb10d2cc1cbaa848e.tar.gz
otp-0197acace48c17dcb500b7bdb10d2cc1cbaa848e.tar.bz2
otp-0197acace48c17dcb500b7bdb10d2cc1cbaa848e.zip
Fix problems with timetrap handling in common_test:
1. ct:timetrap(infinity) not supported. 2. Previous set timetrap for a test case is not cancelled by new one.
Diffstat (limited to 'lib/common_test/src/ct.erl')
-rw-r--r--lib/common_test/src/ct.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index dfec2b7a67..66da3ef742 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -861,6 +861,7 @@ remove_config(Callback, Config) ->
%%%
%%% @doc <p>Use this function to set a new timetrap for the running test case.</p>
timetrap(Time) ->
+ test_server:timetrap_cancel(),
test_server:timetrap(Time).
%%%-----------------------------------------------------------------