Ver código fonte

Replace string:find/2 for compatibility with Erlang/OTP 19

pull/515/head
Led 5 anos atrás
pai
commit
111852480a
3 arquivos alterados com 10 adições e 7 exclusões
  1. +4
    -1
      .travis.yml
  2. +2
    -2
      src/lager.erl
  3. +4
    -4
      test/pr_stacktrace_test.erl

+ 4
- 1
.travis.yml Ver arquivo

@ -4,4 +4,7 @@ otp_release:
- 22.0 - 22.0
- 21.1 - 21.1
- 20.3 - 20.3
matrix:
include:
- otp_release: 19.3
dist: trusty

+ 2
- 2
src/lager.erl Ver arquivo

@ -741,6 +741,6 @@ get_sink_handler_status_unicode_test() ->
validate_status(File) -> validate_status(File) ->
Handler = {lager_file_backend, File}, Handler = {lager_file_backend, File},
Status = get_sink_handler_status(?DEFAULT_SINK, Handler, debug),
?assertNotEqual(nomatch, string:find(Status, File)).
Status = unicode:characters_to_binary(get_sink_handler_status(?DEFAULT_SINK, Handler, debug)),
?assertNotEqual(nomatch, binary:match(Status, unicode:characters_to_binary(File))).
-endif. -endif.

+ 4
- 4
test/pr_stacktrace_test.erl Ver arquivo

@ -29,7 +29,7 @@ pr_stacktrace_throw_test() ->
lager:pr_stacktrace(?GET_STACK(Stacktrace), {Class, Reason}) lager:pr_stacktrace(?GET_STACK(Stacktrace), {Class, Reason})
end, end,
Want = "pr_stacktrace_test:pr_stacktrace_throw_test/0 line 26\n pr_stacktrace_test:make_throw/0 line 16\nthrow:{test,exception}", Want = "pr_stacktrace_test:pr_stacktrace_throw_test/0 line 26\n pr_stacktrace_test:make_throw/0 line 16\nthrow:{test,exception}",
?assertNotEqual(nomatch, string:find(Got, Want)).
?assertNotEqual(0, string:str(Got, Want)).
pr_stacktrace_bad_arg_test() -> pr_stacktrace_bad_arg_test() ->
Got = try Got = try
@ -39,7 +39,7 @@ pr_stacktrace_bad_arg_test() ->
lager:pr_stacktrace(?GET_STACK(Stacktrace), {Class, Reason}) lager:pr_stacktrace(?GET_STACK(Stacktrace), {Class, Reason})
end, end,
Want = "pr_stacktrace_test:pr_stacktrace_bad_arg_test/0 line 36\n pr_stacktrace_test:bad_arg/0 line 22\nerror:badarg", Want = "pr_stacktrace_test:pr_stacktrace_bad_arg_test/0 line 36\n pr_stacktrace_test:bad_arg/0 line 22\nerror:badarg",
?assertNotEqual(nomatch, string:find(Got, Want)).
?assertNotEqual(0, string:str(Got, Want)).
pr_stacktrace_bad_arity_test() -> pr_stacktrace_bad_arity_test() ->
Got = try Got = try
@ -49,7 +49,7 @@ pr_stacktrace_bad_arity_test() ->
lager:pr_stacktrace(?GET_STACK(Stacktrace), {Class, Reason}) lager:pr_stacktrace(?GET_STACK(Stacktrace), {Class, Reason})
end, end,
Want = "pr_stacktrace_test:pr_stacktrace_bad_arity_test/0 line 46\n lists:concat([], [])\nerror:undef", Want = "pr_stacktrace_test:pr_stacktrace_bad_arity_test/0 line 46\n lists:concat([], [])\nerror:undef",
?assertNotEqual(nomatch, string:find(Got, Want)).
?assertNotEqual(0, string:str(Got, Want)).
pr_stacktrace_no_reverse_test() -> pr_stacktrace_no_reverse_test() ->
application:set_env(lager, reverse_pretty_stacktrace, false), application:set_env(lager, reverse_pretty_stacktrace, false),
@ -60,4 +60,4 @@ pr_stacktrace_no_reverse_test() ->
lager:pr_stacktrace(?GET_STACK(Stacktrace), {Class, Reason}) lager:pr_stacktrace(?GET_STACK(Stacktrace), {Class, Reason})
end, end,
Want = "error:undef\n lists:concat([], [])\n pr_stacktrace_test:pr_stacktrace_bad_arity_test/0 line 57", Want = "error:undef\n lists:concat([], [])\n pr_stacktrace_test:pr_stacktrace_bad_arity_test/0 line 57",
?assertEqual(nomatch, string:find(Got, Want)).
?assertEqual(0, string:str(Got, Want)).

Carregando…
Cancelar
Salvar