1 files changed, 31 insertions, 14 deletions
diff --git a/test/ruby/test_pipe.rb b/test/ruby/test_pipe.rb
index 0ac921b9c2..9fa42fd375 100644
--- a/test/ruby/test_pipe.rb
+++ b/test/ruby/test_pipe.rb
@@ -1,7 +1,6 @@
+# frozen_string_literal: false
 require 'test/unit'
-$:.replace([File.dirname(File.expand_path(__FILE__))] | $:)
-require 'ut_eof'
-require 'envutil'
+require_relative 'ut_eof'
 
 class TestPipe < Test::Unit::TestCase
   include TestEOF
@@ -15,18 +14,36 @@ class TestPipe < Test::Unit::TestCase
       r.close
     end
   end
-
-  def test_write
-    bug2559 = '[ruby-core:27425]'
-    a, b = IO.pipe
-    begin
-      a.close
-      assert_raises(Errno::EPIPE, bug2559) do
-        b.write("hi")
+  class WithConversion < self
+    def open_file(content)
+      r, w = IO.pipe
+      w << content
+      w.close
+      r.set_encoding("us-ascii:utf-8")
+      begin
+        yield r
+      ensure
+        r.close
       end
-    ensure
-      a.close if !a.closed?
-      b.close if !b.closed?
     end
   end
+
+  def test_stdout_epipe
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
+    begin;
+      io = STDOUT
+      begin
+        save = io.dup
+        IO.popen("echo", "w", out: IO::NULL) do |f|
+          io.reopen(f)
+          Process.wait(f.pid)
+          assert_raise(Errno::EPIPE) do
+            io.print "foo\n"
+          end
+        end
+      ensure
+        io.reopen(save)
+      end
+    end;
+  end
 end