diff options
author | Peter Andersson <[email protected]> | 2015-03-18 11:10:42 +0100 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2015-03-18 11:10:42 +0100 |
commit | abcf91943c4d0d29c312786d9f531e531c6965a6 (patch) | |
tree | 510f58e414d18b93d704abc90176a7ff3643b58d /lib/common_test/test/ct_netconfc_SUITE_data/ns.erl | |
parent | ae42a30d17367c0c52a057230c18179dcda539bb (diff) | |
parent | cbea3156f051f92ebd355ea05c7904aa080fd72f (diff) | |
download | otp-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_netconfc_SUITE_data/ns.erl')
-rw-r--r-- | lib/common_test/test/ct_netconfc_SUITE_data/ns.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl index f503825c4e..27da67bd1d 100644 --- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl +++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl @@ -351,7 +351,7 @@ check_expected(SessionId,ConnRef,Msg) -> do(ConnRef, Do), reply(ConnRef,Reply); error -> - timer:sleep(1000), + ct:sleep(1000), exit({error,{got_unexpected,SessionId,Msg,ets:tab2list(ns_tab)}}) end. |