From cbea3156f051f92ebd355ea05c7904aa080fd72f Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Tue, 17 Mar 2015 13:34:30 +0100
Subject: Enable timetrap scaling for all tests

---
 .../error/test/cfg_error_12_SUITE.erl                  | 10 +++++-----
 .../error/test/cfg_error_13_SUITE.erl                  |  2 +-
 .../error/test/cfg_error_14_SUITE.erl                  |  2 +-
 .../error/test/cfg_error_3_SUITE.erl                   |  2 +-
 .../error/test/cfg_error_7_SUITE.erl                   |  2 +-
 .../error/test/cfg_error_8_SUITE.erl                   |  4 ++--
 .../error/test/timetrap_1_SUITE.erl                    | 18 +++++++++---------
 .../ct_error_SUITE_data/error/test/timetrap_helper.erl |  2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'lib/common_test/test/ct_error_SUITE_data')

diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_12_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_12_SUITE.erl
index 806d3caf72..0ff8659269 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_12_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_12_SUITE.erl
@@ -26,10 +26,10 @@ init_per_testcase(_, Config) ->
     Config.
 
 end_per_testcase(tc2, _Config) ->
-    timer:sleep(2000),
+    ct:sleep(2000),
     exit(this_should_not_be_printed);
 end_per_testcase(tc4, _Config) ->
-    timer:sleep(2000),
+    ct:sleep(2000),
     exit(this_should_not_be_printed);
 end_per_testcase(_, _) ->
     ok.
@@ -42,7 +42,7 @@ tc1() ->
     put('$test_server_framework_test',
 	fun(init_tc, _Default) ->
 		ct:pal("init_tc(~p): Night time...",[self()]),
-		timer:sleep(2000),
+		ct:sleep(2000),
 		ct:pal("init_tc(~p): Day time!",[self()]),
 		exit(this_should_not_be_printed);
 	   (_, Default) -> Default
@@ -67,7 +67,7 @@ tc3(_) ->
     put('$test_server_framework_test',
 	fun(end_tc, _Default) ->
 		ct:pal("end_tc(~p): Night time...",[self()]),
-		timer:sleep(1000),
+		ct:sleep(1000),
 		ct:pal("end_tc(~p): Day time!",[self()]);
 	   (_, Default) -> Default
 	end),
@@ -78,7 +78,7 @@ tc4() ->
     put('$test_server_framework_test',
 	fun(end_tc, _Default) ->
 		ct:pal("end_tc(~p): Night time...",[self()]),
-		timer:sleep(1000),
+		ct:sleep(1000),
 		ct:pal("end_tc(~p): Day time!",[self()]);
 	   (_, Default) -> Default
 	end),
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_13_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_13_SUITE.erl
index c8a3c1d15e..cfc0babb68 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_13_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_13_SUITE.erl
@@ -26,7 +26,7 @@ init_per_suite() ->
     put('$test_server_framework_test',
 	fun(end_tc, _Default) ->
 		ct:pal("end_tc(~p): Night time...",[self()]),
-		timer:sleep(1000),
+		ct:sleep(1000),
 		ct:pal("end_tc(~p): Day time!",[self()]);
 	   (_, Default) -> Default
 	end),
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_14_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_14_SUITE.erl
index 960d0f61b0..54b09e78c6 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_14_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_14_SUITE.erl
@@ -29,7 +29,7 @@ end_per_suite() ->
     put('$test_server_framework_test',
 	fun(end_tc, _Default) ->
 		ct:pal("end_tc(~p): Night time...",[self()]),
-		timer:sleep(1000),
+		ct:sleep(1000),
 		ct:pal("end_tc(~p): Day time!",[self()]);
 	   (_, Default) -> Default
 	end),
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_3_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_3_SUITE.erl
index 08c57887ef..0d93e46501 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_3_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_3_SUITE.erl
@@ -36,7 +36,7 @@ suite() ->
 %% Reason = term()
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    timer:sleep(5000),
+    ct:sleep(5000),
     exit(shouldnt_happen).
 %    Config.
 
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_7_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_7_SUITE.erl
index 9cd5b6ad29..d95f3b235b 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_7_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_7_SUITE.erl
@@ -43,7 +43,7 @@ init_per_suite(Config) ->
 %% Config0 = Config1 = [tuple()]
 %%--------------------------------------------------------------------
 end_per_suite(Config) ->
-    timer:sleep(5000),
+    ct:sleep(5000),
     ok.
 
 %%--------------------------------------------------------------------
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_8_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_8_SUITE.erl
index 25993833d7..d8f0c48034 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_8_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/cfg_error_8_SUITE.erl
@@ -57,7 +57,7 @@ init_per_group(g1, Config) ->
     Config;
 init_per_group(g2, Config) ->
     ct:comment("init_per_group(g2) timeout"),
-    timer:sleep(5000),
+    ct:sleep(5000),
     Config;
 init_per_group(g3, _Config) ->
     badmatch = 42;
@@ -80,7 +80,7 @@ end_per_group(g11, _Config) ->
     ok;
 end_per_group(g12, _Config) ->
     ct:comment("end_per_group(g6) timeout"),
-    timer:sleep(5000),
+    ct:sleep(5000),
     ok;
 end_per_group(_GroupName, _Config) ->
     ok.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl
index a98382965f..1451a4119e 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl
@@ -111,7 +111,7 @@ end_per_testcase1(tc2, Config) ->
     ct:pal("end_per_testcase(tc2): ~p", [Config]),
     tc2 = ?config(tc, Config),
     {failed,timetrap_timeout} = ?config(tc_status, Config),
-    timer:sleep(2000);
+    ct:sleep(2000);
 
 end_per_testcase1(tc3, Config) ->
     ct:pal("end_per_testcase(tc3): ~p", [Config]),
@@ -123,7 +123,7 @@ end_per_testcase1(tc4, Config) ->
     ct:pal("end_per_testcase(tc4): ~p", [Config]),
     tc4 = ?config(tc, Config),
     {failed,{testcase_aborted,testing_end_conf}} = ?config(tc_status, Config),
-    timer:sleep(2000);
+    ct:sleep(2000);
 
 end_per_testcase1(tc5, Config) ->
     ct:pal("end_per_testcase(tc5): ~p", [Config]),
@@ -182,29 +182,29 @@ all() ->
     [tc1, tc2, tc3, tc4, tc5, tc6, tc7, tc8, tc9].
 
 tc1(_) ->
-    timer:sleep(2000),
+    ct:sleep(2000),
     ok.
 
 tc2(_) ->
-    timer:sleep(2000).
+    ct:sleep(2000).
 
 tc3(_) ->
     spawn(ct, abort_current_testcase, [testing_end_conf]),
-    timer:sleep(2000),
+    ct:sleep(2000),
     ok.
 
 tc4(_) ->
     spawn(ct, abort_current_testcase, [testing_end_conf]),
-    timer:sleep(2000),
+    ct:sleep(2000),
     ok.
 
 tc5(_) ->
-    timer:sleep(2000),
+    ct:sleep(2000),
     ok.
 
 tc6(_) ->
     spawn(ct, abort_current_testcase, [testing_end_conf]),
-    timer:sleep(2000).
+    ct:sleep(2000).
 
 tc7(_) ->
     sleep(2000),
@@ -220,5 +220,5 @@ tc9(_) ->
 
 %%%-----------------------------------------------------------------
 sleep(T) ->
-    timer:sleep(T),
+    ct:sleep(T),
     ok.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_helper.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_helper.erl
index 1389acca11..a9ea0be847 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_helper.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_helper.erl
@@ -3,5 +3,5 @@
 -export([sleep/1]).
 
 sleep(T) ->
-    timer:sleep(T),
+    ct:sleep(T),
     ok.
-- 
cgit v1.2.3