diff options
author | Erlang/OTP <[email protected]> | 2015-05-29 12:40:18 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2015-05-29 12:40:18 +0200 |
commit | e7c279de571a1436af5531597d1f8a7a5b6de490 (patch) | |
tree | 5d319950adbdddc669571e6f750b00f11a984653 /lib/diameter/test/diameter_watchdog_SUITE.erl | |
parent | 6c179d9c4184ca44e6bff649642f710125906977 (diff) | |
parent | d13288d8116e7780a577d023517b24ae329ac823 (diff) | |
download | otp-e7c279de571a1436af5531597d1f8a7a5b6de490.tar.gz otp-e7c279de571a1436af5531597d1f8a7a5b6de490.tar.bz2 otp-e7c279de571a1436af5531597d1f8a7a5b6de490.zip |
Merge branch 'anders/diameter/test/OTP-12767' into maint-17
* anders/diameter/test/OTP-12767:
Replace config suite call to erlang:now/0
Fix incorrect suite usage of OTP 18 monotonic time
Make tls suite crash more verbosely
Diffstat (limited to 'lib/diameter/test/diameter_watchdog_SUITE.erl')
-rw-r--r-- | lib/diameter/test/diameter_watchdog_SUITE.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/diameter/test/diameter_watchdog_SUITE.erl b/lib/diameter/test/diameter_watchdog_SUITE.erl index 5a3ff2c92f..f39e12686e 100644 --- a/lib/diameter/test/diameter_watchdog_SUITE.erl +++ b/lib/diameter/test/diameter_watchdog_SUITE.erl @@ -673,8 +673,7 @@ jitter(T,D) -> %% Generate a unique hostname for the faked peer. hostname() -> - {M,S,U} = diameter_util:timestamp(), - lists:flatten(io_lib:format("~p-~p-~p", [M,S,U])). + ?util:unique_string(). putr(Key, Val) -> put({?MODULE, Key}, Val). |