aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test/ct_hooks_SUITE_data
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2015-03-18 11:10:42 +0100
committerPeter Andersson <[email protected]>2015-03-18 11:10:42 +0100
commitabcf91943c4d0d29c312786d9f531e531c6965a6 (patch)
tree510f58e414d18b93d704abc90176a7ff3643b58d /lib/common_test/test/ct_hooks_SUITE_data
parentae42a30d17367c0c52a057230c18179dcda539bb (diff)
parentcbea3156f051f92ebd355ea05c7904aa080fd72f (diff)
downloadotp-abcf91943c4d0d29c312786d9f531e531c6965a6.tar.gz
otp-abcf91943c4d0d29c312786d9f531e531c6965a6.tar.bz2
otp-abcf91943c4d0d29c312786d9f531e531c6965a6.zip
Merge remote-tracking branch 'origin/peppe/common_test/enable_time_scaling' into maint
* origin/peppe/common_test/enable_time_scaling: Enable timetrap scaling for all tests
Diffstat (limited to 'lib/common_test/test/ct_hooks_SUITE_data')
-rw-r--r--lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl
index 18dd07e87e..80ce248418 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl
@@ -50,7 +50,7 @@ init_per_suite(Config) ->
end_per_suite(Config) ->
Gen = proplists:get_value(gen, Config),
exit(Gen, kill),
- timer:sleep(100),
+ ct:sleep(100),
ok.
%%--------------------------------------------------------------------