File 2620-stdlib-Remove-old-I-O-requests-from-test-suites.patch of Package erlang

From b9aef66da02a8e27b021ad3be2101b221c760a1f Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Thu, 13 Jun 2019 13:20:59 +0200
Subject: [PATCH 10/10] stdlib: Remove old I/O-requests from test suites

---
 lib/stdlib/test/io_proto_SUITE.erl | 20 +-------------------
 lib/stdlib/test/shell_SUITE.erl    |  9 ---------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
index e497b2fb5d..df6958cfa9 100644
--- a/lib/stdlib/test/io_proto_SUITE.erl
+++ b/lib/stdlib/test/io_proto_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1568,10 +1568,6 @@ request({put_chars, Encoding, Chars}, State) ->
 request({put_chars, Encoding, Module, Function, Args}, State) ->
     {ok, ok, State#state{q=[{put_chars, Encoding, Module, Function, Args} | 
 			    State#state.q ]}};
-request({put_chars,Chars}, State) ->
-    {ok, ok, State#state{q=[{put_chars, Chars} | State#state.q ]}};
-request({put_chars,M,F,As}, State) ->
-    {ok, ok, State#state{q=[{put_chars, M,F,As} | State#state.q ]}};
 request({get_until, Encoding, Prompt, M, F, As}, State) ->
     {ok, convert(State#state.nxt, Encoding, State#state.mode), State#state{nxt = eof, q = [{get_until, Encoding, Prompt, M, F, As} | State#state.q]}};
 request({get_chars, Encoding, Prompt, N}, State) ->
@@ -1583,20 +1579,6 @@ request({get_line, Encoding, Prompt}, State) ->
      State#state{nxt = eof, 
 		 q = [{get_line, Encoding, Prompt} | 
 		      State#state.q]}};
-request({get_until, Prompt, M, F, As}, State) ->
-    {ok, convert(State#state.nxt, latin1, State#state.mode), 
-     State#state{nxt = eof, 
-		 q = [{get_until, Prompt, M, F, As} | State#state.q]}};
-request({get_chars, Prompt, N}, State) ->
-    {ok, convert(State#state.nxt, latin1, State#state.mode), 
-     State#state{nxt = eof, 
-		 q = [{get_chars, Prompt, N} | 
-		      State#state.q]}};
-request({get_line, Prompt}, State) ->
-    {ok, convert(State#state.nxt, latin1, State#state.mode), 
-     State#state{nxt = eof, 
-		 q = [{get_line, Prompt} | 
-		      State#state.q]}};
 request({get_geomentry,_}, State) ->
     {error, {error,enotsup}, State};
 request({setopts, Opts}, State) when Opts =:= [{binary, false}]; Opts =:= [list] ->
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index cdb6031b07..4d85e1f04b 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -3141,25 +3141,16 @@ io_request({get_geometry,columns}, S) ->
     {ok,80,S};
 io_request({get_geometry,rows}, S) ->
     {ok,24,S};
-io_request({put_chars,Chars}, S) ->
-    {ok,ok,S#state{reply = [S#state.reply | Chars]}};
 io_request({put_chars,latin1,Chars}, S) ->
     {ok,ok,S#state{reply = [S#state.reply | Chars]}};
 io_request({put_chars,unicode,Chars0}, S) ->
     Chars = unicode:characters_to_list(Chars0),
     {ok,ok,S#state{reply = [S#state.reply | Chars]}};
-io_request({put_chars,Mod,Func,Args}, S) ->
-    case catch apply(Mod, Func, Args) of
-        Chars when is_list(Chars) -> 
-            io_request({put_chars,Chars}, S)
-    end;
 io_request({put_chars,Enc,Mod,Func,Args}, S) ->
     case catch apply(Mod, Func, Args) of
         Chars when is_list(Chars) -> 
             io_request({put_chars,Enc,Chars}, S)
     end;
-io_request({get_until,_Prompt,Mod,Func,ExtraArgs}, S) ->
-    get_until(Mod, Func, ExtraArgs, S, latin1);
 io_request({get_until,Enc,_Prompt,Mod,Func,ExtraArgs}, S) ->
     get_until(Mod, Func, ExtraArgs, S, Enc).
 
-- 
2.16.4

openSUSE Build Service is sponsored by