aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/test/diameter_watchdog_SUITE.erl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2015-03-05 01:34:08 +0100
committerAnders Svensson <[email protected]>2015-03-05 01:34:08 +0100
commit5e5b22215e3f0a60b7afc2393b3ef68892360b07 (patch)
tree1c0a2c3b66c6af9eae4ba6587b911681a075ae64 /lib/diameter/test/diameter_watchdog_SUITE.erl
parenta4df8f2e68ccef9936c5b43378a006099d81f801 (diff)
parenteae8ecd1fd2ba33b1c81d0c19605047e2f317eda (diff)
downloadotp-5e5b22215e3f0a60b7afc2393b3ef68892360b07.tar.gz
otp-5e5b22215e3f0a60b7afc2393b3ef68892360b07.tar.bz2
otp-5e5b22215e3f0a60b7afc2393b3ef68892360b07.zip
Merge branch 'anders/diameter/time/OTP-12439' into maint
* anders/diameter/time/OTP-12439: Use new time api in test suites Use new time api in implementation
Diffstat (limited to 'lib/diameter/test/diameter_watchdog_SUITE.erl')
-rw-r--r--lib/diameter/test/diameter_watchdog_SUITE.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/diameter/test/diameter_watchdog_SUITE.erl b/lib/diameter/test/diameter_watchdog_SUITE.erl
index b6e8730ec2..5a3ff2c92f 100644
--- a/lib/diameter/test/diameter_watchdog_SUITE.erl
+++ b/lib/diameter/test/diameter_watchdog_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2015. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -420,6 +420,7 @@ suspect(TRef, false, SvcName, N) ->
%% abuse/1
abuse(F) ->
+
[] = run([[abuse, F, T] || T <- [listen, connect]]).
abuse(F, [_,_,_|_] = Args) ->
@@ -672,7 +673,8 @@ jitter(T,D) ->
%% Generate a unique hostname for the faked peer.
hostname() ->
- lists:flatten(io_lib:format("~p-~p-~p", tuple_to_list(now()))).
+ {M,S,U} = diameter_util:timestamp(),
+ lists:flatten(io_lib:format("~p-~p-~p", [M,S,U])).
putr(Key, Val) ->
put({?MODULE, Key}, Val).