diff options
| author | Siri Hansen <[email protected]> | 2019-03-04 12:07:02 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2019-03-04 12:07:02 +0100 |
| commit | 4d72eedc0d3573e9709b8f2c8773429e85529d7f (patch) | |
| tree | 1205a9db5d6dda3e1db50bdd221d9bb802089647 /lib/kernel/test | |
| parent | 2a527454677dc0216c5d47ad580aad2e913e1b9a (diff) | |
| parent | 6d795779f770deb1829e1df2fa4a75f41e602d35 (diff) | |
| download | otp-4d72eedc0d3573e9709b8f2c8773429e85529d7f.tar.gz otp-4d72eedc0d3573e9709b8f2c8773429e85529d7f.tar.bz2 otp-4d72eedc0d3573e9709b8f2c8773429e85529d7f.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/test')
| -rw-r--r-- | lib/kernel/test/logger_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/kernel/test/logger_formatter_SUITE.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/kernel/test/logger_SUITE.erl b/lib/kernel/test/logger_SUITE.erl index 2dad651f9c..70bb775db8 100644 --- a/lib/kernel/test/logger_SUITE.erl +++ b/lib/kernel/test/logger_SUITE.erl @@ -899,14 +899,14 @@ process_metadata(_Config) -> undefined = logger:get_process_metadata(), {error,badarg} = ?TRY(logger:set_process_metadata(bad)), ok = logger:add_handler(h1,?MODULE,#{level=>notice,filter_default=>log}), - Time = erlang:system_time(microsecond), + Time = logger:timestamp(), ProcMeta = #{time=>Time,line=>0,custom=>proc}, ok = logger:set_process_metadata(ProcMeta), S1 = ?str, ?LOG_NOTICE(S1,#{custom=>macro}), check_logged(notice,S1,#{time=>Time,line=>0,custom=>macro}), - Time2 = erlang:system_time(microsecond), + Time2 = logger:timestamp(), S2 = ?str, ?LOG_NOTICE(S2,#{time=>Time2,line=>1,custom=>macro}), check_logged(notice,S2,#{time=>Time2,line=>1,custom=>macro}), diff --git a/lib/kernel/test/logger_formatter_SUITE.erl b/lib/kernel/test/logger_formatter_SUITE.erl index 8c13f0f908..83e3e6c40a 100644 --- a/lib/kernel/test/logger_formatter_SUITE.erl +++ b/lib/kernel/test/logger_formatter_SUITE.erl @@ -867,7 +867,7 @@ my_try(Fun) -> try Fun() catch C:R:S -> {C,R,hd(S)} end. timestamp() -> - erlang:system_time(microsecond). + logger:timestamp(). %% necessary? add_time(#{time:=_}=Meta) -> |