diff options
| author | Micael Karlberg <[email protected]> | 2012-01-12 14:36:25 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-01-12 14:36:25 +0100 |
| commit | fdf31ed028c3cf27387debd1efff3f1e649cd451 (patch) | |
| tree | bde23761a1b92b6da29f8fa51abaee2c4700a5db /lib/snmp/test/snmp_manager_config_test.erl | |
| parent | c634c9c5f022c7f8ba91e1ef9d8fede838153f3a (diff) | |
| parent | 40f968c06136e6268575daab02cfd6bd26f95fc6 (diff) | |
| download | otp-fdf31ed028c3cf27387debd1efff3f1e649cd451.tar.gz otp-fdf31ed028c3cf27387debd1efff3f1e649cd451.tar.bz2 otp-fdf31ed028c3cf27387debd1efff3f1e649cd451.zip | |
Merge branch 'bmk/snmp/agent/synchronizing_vacm_dumping/r14/OTP-9851' into bmk/snmp/snmp4215_integration/r14
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'lib/snmp/test/snmp_manager_config_test.erl')
| -rw-r--r-- | lib/snmp/test/snmp_manager_config_test.erl | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/snmp/test/snmp_manager_config_test.erl b/lib/snmp/test/snmp_manager_config_test.erl index 4498d506f3..3192fe1b40 100644 --- a/lib/snmp/test/snmp_manager_config_test.erl +++ b/lib/snmp/test/snmp_manager_config_test.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2011. All Rights Reserved. +%% Copyright Ericsson AB 2004-2012. 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 @@ -2726,14 +2726,7 @@ p(F, A) -> p(TName, F, A) -> io:format("*** [~s] ***" - " ~w -> " ++ F ++ "~n", [format_timestamp(now()),TName|A]). - -format_timestamp({_N1, _N2, N3} = Now) -> - {Date, Time} = calendar:now_to_datetime(Now), - {YYYY,MM,DD} = Date, - {Hour,Min,Sec} = Time, - FormatDate = - io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w", - [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]), - lists:flatten(FormatDate). + " ~w -> " ++ F ++ "~n", [formated_timestamp(),TName|A]). +formated_timestamp() -> + snmp_test_lib:formated_timestamp(). |