Merge branch 'bjorn/stdlib/modernize-tests'

* bjorn/stdlib/modernize-tests:
  Eliminate use of ?config() macro
  Remove ?line macros
  Replace "%" with "%%" at the beginning of a line
  Eliminate 'suite' and 'doc' clauses
  gen_server_SUITE: Eliminate use of test_server:timecall/3
  Use 'test_server' instead of ?t macro
  Eliminate use of test_server:messages_get/0
  sys_SUITE: Replace test_server:capture*/0 with ct:capture*/0
  sys_SUITE: Mend test cases that didn't test what they should
  Replace calls to test_server:sleep/1 with ct:sleep/1 or timer:sleep/1
  Eliminate use of test_server:do_times()
  Replace use of test_server:format/2 with io:format/2
  Eliminate use of test_server:fail/0,1
  Modernize use of timetraps

1 files changed, 6 insertions, 11 deletions

diff --git a/lib/stdlib/test/erl_internal_SUITE.erl b/lib/stdlib/test/erl_internal_SUITE.erl
index ad0b37aae3..45e67226b7 100644
--- a/lib/stdlib/test/erl_internal_SUITE.erl
+++ b/lib/stdlib/test/erl_internal_SUITE.erl
@@ -28,7 +28,9 @@
 
 -include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     [behav].
@@ -49,20 +51,13 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
--define(default_timeout, ?t:minutes(2)).
-
 init_per_testcase(_Case, Config) ->
-    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.
 
-behav(suite) -> [];
-behav(doc) ->
-    ["Check that the behaviour callbacks are correctly defined"];
+%% Check that the behaviour callbacks are correctly defined.
 behav(_) ->
     Modules = [application, gen_server, gen_fsm, gen_event,
                supervisor_bridge, supervisor],