1 files changed, 25 insertions, 1 deletions
diff --git a/spec/ruby/core/io/close_spec.rb b/spec/ruby/core/io/close_spec.rb
index 0e51ec23d2..77a8748e7c 100644
--- a/spec/ruby/core/io/close_spec.rb
+++ b/spec/ruby/core/io/close_spec.rb
@@ -31,6 +31,13 @@ describe "IO#close" do
     lambda { @io.write "data" }.should raise_error(IOError)
   end
 
+  it 'does not close the stream if autoclose is false' do
+    other_io = IO.new(@io.fileno)
+    other_io.autoclose = false
+    other_io.close
+    lambda { @io.write "data" }.should_not raise_error(IOError)
+  end
+
   ruby_version_is ''...'2.3' do
     it "raises an IOError if closed" do
       @io.close
@@ -45,6 +52,24 @@ describe "IO#close" do
       @io.close.should be_nil
     end
   end
+
+  ruby_version_is '2.5' do
+    it 'raises an IOError with a clear message' do
+      read_io, write_io = IO.pipe
+      going_to_read = false
+      thread = Thread.new do
+        lambda do
+          going_to_read = true
+          read_io.read
+        end.should raise_error(IOError, 'stream closed in another thread')
+      end
+
+      Thread.pass until going_to_read && thread.stop?
+      read_io.close
+      thread.join
+      write_io.close
+    end
+  end
 end
 
 describe "IO#close on an IO.popen stream" do
@@ -79,4 +104,3 @@ describe "IO#close on an IO.popen stream" do
   end
 
 end
-