diff options
| author | Dan Gudmundsson <[email protected]> | 2012-10-03 14:34:10 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-10-30 16:13:15 +0100 |
| commit | f17020af337cf34560e939d822229262a214f28d (patch) | |
| tree | 1ac379e674a144c1c54d23c2ac1c5e0c9eb8f24d /lib/asn1 | |
| parent | 1b6a0cab33fa0b34c5e28820c6ddc4e18b0111fa (diff) | |
| download | otp-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/asn1')
| -rw-r--r-- | lib/asn1/test/asn1_SUITE.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl index b0c37d79e7..501157b9b4 100644 --- a/lib/asn1/test/asn1_SUITE.erl +++ b/lib/asn1/test/asn1_SUITE.erl @@ -1,3 +1,4 @@ +%% %% %CopyrightBegin% %% %% Copyright Ericsson AB 2001-2012. All Rights Reserved. @@ -242,8 +243,8 @@ init_per_testcase(Func, Config) -> true = code:add_patha(CaseDir), Dog = case Func of - testX420 -> test_server:timetrap({minutes, 90}); - _ -> test_server:timetrap({minutes, 60}) + testX420 -> ct:timetrap({minutes, 90}); + _ -> ct:timetrap({minutes, 60}) end, [{case_dir, CaseDir}, {watchdog, Dog}|Config]. |