diff options
author | Erland Schönbeck <[email protected]> | 2015-04-28 13:32:55 +0200 |
---|---|---|
committer | Erland Schönbeck <[email protected]> | 2015-04-28 13:32:55 +0200 |
commit | 22173c2e4d65e47039975b91015560ae4256b3c1 (patch) | |
tree | 807470de259e85483b79b40e6e8f85c89608b982 /lib/snmp/test/snmp_test_mgr.erl | |
parent | 861145a503c77d8144033f38d288bdda31699edd (diff) | |
parent | 722357d7a23ee4a47277f05aa5fd593bc4de0db0 (diff) | |
download | otp-22173c2e4d65e47039975b91015560ae4256b3c1.tar.gz otp-22173c2e4d65e47039975b91015560ae4256b3c1.tar.bz2 otp-22173c2e4d65e47039975b91015560ae4256b3c1.zip |
Merge branch 'erland/OTP18/snmp/OTP-12452'
* erland/OTP18/snmp/OTP-12452:
snmp: Remove deprecated warning for erlang:now in snmp_verbority
snmp: Change to random use crypto. Remove use of erlang:now
Diffstat (limited to 'lib/snmp/test/snmp_test_mgr.erl')
-rw-r--r-- | lib/snmp/test/snmp_test_mgr.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/snmp/test/snmp_test_mgr.erl b/lib/snmp/test/snmp_test_mgr.erl index 8cb6ec588e..1bf7efc695 100644 --- a/lib/snmp/test/snmp_test_mgr.erl +++ b/lib/snmp/test/snmp_test_mgr.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2014. All Rights Reserved. +%% Copyright Ericsson AB 1996-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 @@ -188,8 +188,9 @@ receive_trap(Timeout) -> init({Options, CallerPid}) -> put(sname, mgr), put(verbosity, debug), - {A1,A2,A3} = erlang:now(), - random:seed(A1,A2,A3), + random:seed(erlang:phash2([node()]), + erlang:monotonic_time(), + erlang:unique_integer()), case (catch is_options_ok(Options)) of true -> put(debug, get_value(debug, Options, false)), @@ -1135,4 +1136,3 @@ d(_,_F,_A) -> formated_timestamp() -> snmp_test_lib:formated_timestamp(). - |