aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFredrik Gustafsson <fredrik@erlang.org>2013-10-09 13:06:08 +0200
committerFredrik Gustafsson <fredrik@erlang.org>2013-10-09 13:06:08 +0200
commit5c61f1e9a0d20233e9c3f84c73d48328faa9d47a (patch)
treefe0365b0dd44b83898d67cd2879e93e0a914379c /lib
parentc8b667f1bd37e3b4715e98b3b571355c66e75961 (diff)
parent2e8c51a58225dff0ac88562a22413c23c2a845c0 (diff)
downloadotp-5c61f1e9a0d20233e9c3f84c73d48328faa9d47a.tar.gz
otp-5c61f1e9a0d20233e9c3f84c73d48328faa9d47a.tar.bz2
otp-5c61f1e9a0d20233e9c3f84c73d48328faa9d47a.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/eunit/src/eunit_proc.erl13
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/eunit/src/eunit_proc.erl b/lib/eunit/src/eunit_proc.erl
index ec7d93fd48..03d1a18321 100644
--- a/lib/eunit/src/eunit_proc.erl
+++ b/lib/eunit/src/eunit_proc.erl
@@ -643,11 +643,11 @@ io_request({get_until, _Prompt, _M, _F, _As}, Buf) ->
io_request({setopts, _Opts}, Buf) ->
{ok, Buf};
io_request(getopts, Buf) ->
- {error, {error, enotsup}, Buf};
+ {{error, enotsup}, Buf};
io_request({get_geometry,columns}, Buf) ->
- {error, {error, enotsup}, Buf};
+ {{error, enotsup}, Buf};
io_request({get_geometry,rows}, Buf) ->
- {error, {error, enotsup}, Buf};
+ {{error, enotsup}, Buf};
io_request({requests, Reqs}, Buf) ->
io_requests(Reqs, {ok, Buf});
io_request(_, Buf) ->
@@ -657,3 +657,10 @@ io_requests([R | Rs], {ok, Buf}) ->
io_requests(Rs, io_request(R, Buf));
io_requests(_, Result) ->
Result.
+
+-ifdef(TEST).
+io_error_test_() ->
+ [?_assertMatch({error, enotsup}, io:getopts()),
+ ?_assertMatch({error, enotsup}, io:columns()),
+ ?_assertMatch({error, enotsup}, io:rows())].
+-endif.