File 1306-stdlib-Add-more-error_info-tests-and-bette... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1306-stdlib-Add-more-error_info-tests-and-better-unicode-.patch of Package erlang (Revision 0eb87917a75aae8f396ec39332087beb)

Currently displaying revision 0eb87917a75aae8f396ec39332087beb , Show latest

From 5db3d06fd2506f87c88282ccd0ca6320807b9f08 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Wed, 28 Apr 2021 15:36:57 +0200
Subject: [PATCH 6/6] stdlib: Add more error_info tests and better unicode
 handling

---
 lib/stdlib/src/erl_error.erl         |  6 ++--
 lib/stdlib/src/erl_stdlib_errors.erl |  8 ++---
 lib/stdlib/test/error_info_lib.erl   |  4 +--
 lib/stdlib/test/io_SUITE.erl         | 53 ++++++++++++++++++++++------
 4 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/lib/stdlib/src/erl_error.erl b/lib/stdlib/src/erl_error.erl
index c2c9c05e38..f6870b875b 100644
--- a/lib/stdlib/src/erl_error.erl
+++ b/lib/stdlib/src/erl_error.erl
@@ -360,9 +360,9 @@ format_arg_errors(ArgNum, [_|As], ErrorMap) ->
             [FirstLine | Lines] = string:lexemes(Err, "\r\n"),
             ArgStr = io_lib:format(<<"*** argument ~w: ">>, [ArgNum]),
             [io_lib:format(<<"~ts~ts">>, [ArgStr, FirstLine])] ++
-                [io_lib:format(<<"~*ts~ts">>,[string:length(ArgStr), "", Line]) ||
-                    Line <- Lines] ++
-             format_arg_errors(ArgNum + 1, As, ErrorMap);
+                [io_lib:format(<<"~*ts~ts">>,[string:length(ArgStr), "", Line])
+                 || Line <- Lines] ++
+                format_arg_errors(ArgNum + 1, As, ErrorMap);
         #{} ->
             format_arg_errors(ArgNum + 1, As, ErrorMap)
     end;
diff --git a/lib/stdlib/src/erl_stdlib_errors.erl b/lib/stdlib/src/erl_stdlib_errors.erl
index 250a42a822..a8c0744bc5 100644
--- a/lib/stdlib/src/erl_stdlib_errors.erl
+++ b/lib/stdlib/src/erl_stdlib_errors.erl
@@ -472,9 +472,9 @@ maybe_posix_message(Cause, HasDevice) ->
         "unknown POSIX error" ->
             unknown;
         PosixStr when HasDevice ->
-            [io_lib:format("~ts (~p)",[PosixStr, Cause])];
+            [io_lib:format("~ts (~tp)",[PosixStr, Cause])];
         PosixStr when not HasDevice ->
-            [{general,io_lib:format("~ts (~p)",[PosixStr, Cause])}]
+            [{general,io_lib:format("~ts (~tp)",[PosixStr, Cause])}]
     end.
 
 check_io_format([Fmt], Cause) ->
@@ -507,7 +507,7 @@ check_io_format([Fmt, Args], Cause) ->
                         [] ->
                             try io_lib:format(Fmt, Args) of
                                 _ ->
-                                    [io_lib:format("unknown error: ~p",[Cause])]
+                                    [{general,{unknown_error,Cause}}]
                             catch _:_ ->
                                     [format_failed]
                             end;
@@ -1055,7 +1055,7 @@ expand_error(same_as_keypos) ->
     <<"the position is the same as the key position">>;
 expand_error({unknown_error,Cause}) ->
     unicode:characters_to_binary(
-      io_lib:format("unknown error: ~p", [Cause]));
+      io_lib:format("unknown error: ~tp", [Cause]));
 expand_error(update_op_range) ->
     <<"the position in the update operation is out of range">>;
 expand_error(Other) ->
diff --git a/lib/stdlib/test/error_info_lib.erl b/lib/stdlib/test/error_info_lib.erl
index 8a10b71409..716fa47eb9 100644
--- a/lib/stdlib/test/error_info_lib.erl
+++ b/lib/stdlib/test/error_info_lib.erl
@@ -90,7 +90,7 @@ eval_bif_error(F, Args, Opts, T, Module, Errors0) ->
             AllowRename = lists:member(allow_rename, Opts),
             SF = fun(Mod, _, _) -> Mod =:= test_server end,
             Str = erl_error:format_exception(error, Reason, Stk, #{stack_trim_fun => SF}),
-            BinStr = iolist_to_binary(Str),
+            BinStr = unicode:characters_to_binary(Str),
             ArgStr = lists:join(", ", [io_lib:format("~p", [A]) || A <- Args]),
             io:format("\n~p:~p(~s)\n~ts", [Module,F,ArgStr,BinStr]),
 
@@ -118,7 +118,7 @@ eval_bif_error(F, Args, Opts, T, Module, Errors0) ->
                             false ->
                                 lists:foldl(
                                   fun(Match, Errors) ->
-                                          case re:run(BinStr, Match, [global]) of
+                                          case re:run(BinStr, Match, [global, unicode]) of
                                               {match,[_]} ->
                                                   Errors;
                                               {match,_} ->
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index 2dacabf7b5..9763fb078f 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -2953,17 +2953,26 @@ otp_15875(_Config) ->
         ],
     ok.
 
-error_info(_Config) ->
+error_info(Config) ->
+
+    PrivDir = proplists:get_value(priv_dir, Config),
+    TmpFile = filename:join(PrivDir,?FUNCTION_NAME),
 
     FullDev =
         fun() ->
-                {ok, Dev} = file:open("/dev/full",[read, write]),
-                Dev
+                case file:read_file_info("/dev/full") of
+                    {ok, _} ->
+                        {ok, Dev} = file:open("/dev/full", [read, write]),
+                        Dev;
+                    _ ->
+                        dummy_full_device()
+                end
         end,
 
+    UnknownDev = fun dummy_unknown_error_device/0,
+
     Latin1Dev = fun() ->
-                        {ok, Dev} = file:open("/dev/full",[read, write,
-                                                           {encoding, latin1}]),
+                        {ok, Dev} = file:open(TmpFile, [read, write, {encoding, latin1}]),
                         Dev
                 end,
 
@@ -2988,18 +2997,24 @@ error_info(_Config) ->
          {put_chars,["test"], [{gl,FullDev()},{general,"no space left on device"}]},
          {put_chars,[Latin1Dev(),"Спутник-1"], [{1,"transcode"}]},
          {put_chars,[a], [{1,"not valid character data"}]},
+         {put_chars,[UnknownDev(),"test"], [{general,"unknown error: 'Спутник-1'"}]},
+         {put_chars,["test"], [{gl,UnknownDev()},{general,"unknown error: 'Спутник-1'"}]},
 
          {write,[DeadDev,"test"],[{1,"terminated"}]},
          {write,["test"],[{gl,DeadDev},{general,"terminated"}]},
          {write,[?MODULE,"test"],[{1,"does not exist"}]},
          {write,[FullDev(),"test"], [{1,"no space left on device"}]},
          {write,["test"], [{gl,FullDev()},{general,"no space left on device"}]},
+         {write,[UnknownDev(),"test"], [{general,"unknown error: 'Спутник-1'"}]},
+         {write,["test"], [{gl,UnknownDev()},{general,"unknown error: 'Спутник-1'"}]},
 
          {nl,[DeadDev],[{1,"terminated"}]},
          {nl,[?MODULE],[{1,"does not exist"}]},
          {nl,[],[{gl,DeadDev},{general,"terminated"}]},
          {nl,[FullDev()], [{1,"no space left on device"}]},
          {nl,[], [{gl,FullDev()},{general,"no space left on device"}]},
+         {nl,[UnknownDev()], [{general,"unknown error: 'Спутник-1'"}]},
+         {nl,[], [{gl,UnknownDev()},{general,"unknown error: 'Спутник-1'"}]},
 
          [[{Format,[DeadDev,"test",[]],   [{1,"terminated"}]},
            {Format,["test",[{gl,DeadDev},  {general,"terminated"}]]},
@@ -3008,6 +3023,7 @@ error_info(_Config) ->
            {Format,["test"], [{gl,FullDev()},{general,"no space left on device"}]},
            {Format,[standard_io,"test"],  [{1,"wrong number of arguments"},
                                            {general,"possibly missing argument list"}]},
+           {Format,[UnknownDev(),"test",[]], [{general,"unknown error: 'Спутник-1'"}]},
 
            %% Test a latin1 device
            {Format,[Latin1Dev(), "~ts", [<<"Спутник-1"/utf8>>]],[{1,"transcode"}]},
@@ -3087,11 +3103,28 @@ error_info(_Config) ->
 
         ],
 
-    try
-        error_info_lib:test_error_info(io, lists:flatten(L), [allow_nyi])
-    after
-        dbg:stop_clear()
-    end.
+    error_info_lib:test_error_info(io, lists:flatten(L), [allow_nyi]).
+
+dummy_full_device() ->
+    dummy_device(enospc).
+dummy_unknown_error_device() ->
+    dummy_device('Спутник-1').
+
+dummy_device(Error) ->
+    spawn_link(
+      fun() ->
+              receive
+                  {io_request, From, ReplyAs, {put_chars, _Encoding, _Chars}} ->
+                      From ! {io_reply, ReplyAs, {error, Error}};
+                  {io_request, From, ReplyAs, {put_chars, _Encoding, M, F, As}} ->
+                      try apply(M, F, As) of
+                          _ ->
+                              From ! {io_reply, ReplyAs, {error, Error}}
+                      catch _:_ ->
+                              From ! {io_reply, ReplyAs, {error, format}}
+                      end
+              end
+      end).
 
 %% GH-5053. 'chars_limit' bug.
 otp_17525(_Config) ->
-- 
2.26.2

Places

File 1306-stdlib-Add-more-error_info-tests-and-better-unicode-.patch of Package erlang (Revision 0eb87917a75aae8f396ec39332087beb)

Places