aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/test/seq_trace_SUITE.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-03-02 16:10:02 +0100
committerBjörn Gustavsson <[email protected]>2016-03-09 14:02:50 +0100
commit9870d22b2401b60221aa42c78bdb7ec4a812e9e7 (patch)
treef0d4e4d0feb88c64695cb63d6d072969b2a157ff /lib/kernel/test/seq_trace_SUITE.erl
parentbb1eb9bfa336afeb945fd1a5c494cfdaefb5183d (diff)
downloadotp-9870d22b2401b60221aa42c78bdb7ec4a812e9e7.tar.gz
otp-9870d22b2401b60221aa42c78bdb7ec4a812e9e7.tar.bz2
otp-9870d22b2401b60221aa42c78bdb7ec4a812e9e7.zip
Modernize timetraps
Diffstat (limited to 'lib/kernel/test/seq_trace_SUITE.erl')
-rw-r--r--lib/kernel/test/seq_trace_SUITE.erl19
1 files changed, 7 insertions, 12 deletions
diff --git a/lib/kernel/test/seq_trace_SUITE.erl b/lib/kernel/test/seq_trace_SUITE.erl
index fb6f62d2e5..ba6d69b74d 100644
--- a/lib/kernel/test/seq_trace_SUITE.erl
+++ b/lib/kernel/test/seq_trace_SUITE.erl
@@ -40,9 +40,9 @@
monotonic_timestamp,
strict_monotonic_timestamp]).
--define(default_timeout, ?t:minutes(1)).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+ [{ct_hooks,[ts_install_cth]},
+ {timetrap,{minutes,1}}].
all() ->
[token_set_get, tracer_set_get, print, send,
@@ -67,12 +67,9 @@ end_per_group(_GroupName, Config) ->
init_per_testcase(_Case, Config) ->
- ?line Dog = test_server:timetrap(?default_timeout),
- [{watchdog, Dog}|Config].
+ Config.
-end_per_testcase(_Case, Config) ->
- Dog=?config(watchdog, Config),
- test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
ok.
%% Verifies that the set_token and get_token functions work as expected
@@ -480,7 +477,7 @@ match_set_seq_token(doc) ->
"corrupt the heap"];
match_set_seq_token(Config) when is_list(Config) ->
?line Parent = self(),
- ?line Timetrap = test_server:timetrap(test_server:seconds(20)),
+
%% OTP-4222 Match spec 'set_seq_token' corrupts heap
%%
%% This test crashes the emulator if the bug in question is present,
@@ -529,7 +526,6 @@ match_set_seq_token(Config) when is_list(Config) ->
?line ok = check_match_set_seq_token_log(Lbl, Log),
%%
?line stop_node(Sandbox),
- ?line test_server:timetrap_cancel(Timetrap),
ok.
%% OTP-4222 Match spec 'set_seq_token' corrupts heap
@@ -628,7 +624,7 @@ gc_seq_token(doc) ->
"can be garbage collected."];
gc_seq_token(Config) when is_list(Config) ->
?line Parent = self(),
- ?line Timetrap = test_server:timetrap(test_server:seconds(20)),
+
%% OTP-4555 Seq trace token causes free mem read in gc
%%
%% This test crashes the emulator if the bug in question is present,
@@ -676,7 +672,6 @@ gc_seq_token(Config) when is_list(Config) ->
end,
%%
?line stop_node(Sandbox),
- ?line test_server:timetrap_cancel(Timetrap),
ok.
do_gc_seq_token(Label) ->