1 files changed, 9 insertions, 10 deletions
diff --git a/test/ruby/test_readpartial.rb b/test/ruby/test_readpartial.rb
index 3877e21f85..bc22556cd4 100644
--- a/test/ruby/test_readpartial.rb
+++ b/test/ruby/test_readpartial.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'test/unit'
 require 'timeout'
 require 'fcntl'
@@ -5,6 +6,8 @@ require 'fcntl'
 class TestReadPartial < Test::Unit::TestCase
   def make_pipe
     r, w = IO.pipe
+    r.binmode
+    w.binmode
     begin
       yield r, w
     ensure
@@ -38,19 +41,18 @@ class TestReadPartial < Test::Unit::TestCase
       w.close
       assert_equal('ab', r.readpartial(2))
       assert_equal('c', r.readpartial(2))
-      assert_raises(EOFError) { r.readpartial(2) }
-      assert_raises(EOFError) { r.readpartial(2) }
+      assert_raise(EOFError) { r.readpartial(2) }
+      assert_raise(EOFError) { r.readpartial(2) }
     }
   end
 
-  if !File::ALT_SEPARATOR # read on pipe cannot timeout on Windows.
   def test_open_pipe
     pipe {|r, w|
       w << 'abc'
       assert_equal('ab', r.readpartial(2))
       assert_equal('c', r.readpartial(2))
-      assert_raises(TimeoutError) {
-        timeout(0.1) { r.readpartial(2) }
+      assert_raise(Timeout::Error) {
+        Timeout.timeout(0.1) { r.readpartial(2) }
       }
     }
   end
@@ -63,12 +65,9 @@ class TestReadPartial < Test::Unit::TestCase
       assert_equal("de", r.readpartial(2))
       assert_equal("f\n", r.readpartial(4096))
       assert_equal("ghi\n", r.readpartial(4096))
-      assert_raises(TimeoutError) {
-        timeout(0.1) { r.readpartial(2) }
+      assert_raise(Timeout::Error) {
+        Timeout.timeout(0.1) { r.readpartial(2) }
       }
     }
   end
-  end
-
 end
-