From 6e32f9645718c66585ac9b751105c730fbf68534 Mon Sep 17 00:00:00 2001
From: Jun Aruga <jaruga@redhat.com>
Date: Mon, 18 Apr 2016 18:06:10 +0200
Subject: [PATCH] Fix test suite for Ruby 2.3 compatibility.

---
 tests/file_tail_test.rb | 70 ++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/tests/file_tail_test.rb b/tests/file_tail_test.rb
index 4ea470d..5b30691 100644
--- a/tests/file_tail_test.rb
+++ b/tests/file_tail_test.rb
@@ -59,58 +59,58 @@ def test_backward_small_buffer2
   end
 
   def test_tail_with_block_without_n
-    timeout(10) do
+    Timeout::timeout(10) do
       lines = []
       @in.backward(1)
-      assert_raises(TimeoutError) do
-        timeout(1) { @in.tail { |l| lines << l } }
+      assert_raises(Timeout::Error) do
+        Timeout::timeout(1) { @in.tail { |l| lines << l } }
       end
       assert_equal(1, lines.size)
       #
       lines = []
       @in.backward(10)
-      assert_raises(TimeoutError) do
-        timeout(1) { @in.tail { |l| lines << l } }
+      assert_raises(Timeout::Error) do
+        Timeout::timeout(1) { @in.tail { |l| lines << l } }
       end
       assert_equal(10, lines.size)
       #
       lines = []
       @in.backward(100)
-      assert_raises(TimeoutError) do
-        timeout(1) { @in.tail { |l| lines << l } }
+      assert_raises(Timeout::Error) do
+        Timeout::timeout(1) { @in.tail { |l| lines << l } }
       end
       assert_equal(100, lines.size)
       #
       lines = []
       @in.backward(101)
-      assert_raises(TimeoutError) do
-        timeout(1) { @in.tail { |l| lines << l } }
+      assert_raises(Timeout::Error) do
+        Timeout::timeout(1) { @in.tail { |l| lines << l } }
       end
     end
   end
 
   def test_tail_with_block_with_n
-    timeout(10) do
+    Timeout::timeout(10) do
       @in.backward(1)
       lines = []
-      timeout(1) { @in.tail(0) { |l| lines << l } }
+      Timeout::timeout(1) { @in.tail(0) { |l| lines << l } }
       assert_equal(0, lines.size)
       #
       @in.backward(1)
       lines = []
-      timeout(1) { @in.tail(1) { |l| lines << l } }
+      Timeout::timeout(1) { @in.tail(1) { |l| lines << l } }
       assert_equal(1, lines.size)
       #
       @in.backward(10)
       lines = []
-      timeout(1) { @in.tail(10) { |l| lines << l } }
+      Timeout::timeout(1) { @in.tail(10) { |l| lines << l } }
       assert_equal(10, lines.size)
       #
       @in.backward(100)
       lines = []
       @in.backward(1)
-      assert_raises(TimeoutError) do
-        timeout(1) { @in.tail(2) { |l| lines << l } }
+      assert_raises(Timeout::Error) do
+        Timeout::timeout(1) { @in.tail(2) { |l| lines << l } }
       end
       assert_equal(1, lines.size)
       #
@@ -118,27 +118,27 @@ def test_tail_with_block_with_n
   end
 
   def test_tail_without_block_with_n
-    timeout(10) do
+    Timeout::timeout(10) do
       @in.backward(1)
       lines = []
-      timeout(1) { lines += @in.tail(0) }
+      Timeout::timeout(1) { lines += @in.tail(0) }
       assert_equal(0, lines.size)
       #
       @in.backward(1)
       lines = []
-      timeout(1) { lines += @in.tail(1) }
+      Timeout::timeout(1) { lines += @in.tail(1) }
       assert_equal(1, lines.size)
       #
       @in.backward(10)
       lines = []
-      timeout(1) { lines += @in.tail(10) }
+      Timeout::timeout(1) { lines += @in.tail(10) }
       assert_equal(10, lines.size)
       #
       @in.backward(100)
       lines = []
       @in.backward(1)
-      assert_raises(TimeoutError) do
-        timeout(1) { lines += @in.tail(2) }
+      assert_raises(Timeout::Error) do
+        Timeout::timeout(1) { lines += @in.tail(2) }
       end
       assert_equal(0, lines.size)
     end
@@ -149,8 +149,8 @@ def test_tail_withappend
     lines = []
     logger = Thread.new do
       begin
-        timeout(1) { @in.tail { |l| lines << l } }
-      rescue TimeoutError
+        Timeout::timeout(1) { @in.tail { |l| lines << l } }
+      rescue Timeout::Error
       end
     end
     appender = Thread.new { append(@out, 10) }
@@ -164,12 +164,12 @@ def test_tail_truncated
     lines = []
     logger = Thread.new do
       begin
-        timeout(10) do
+        Timeout::timeout(10) do
           @in.tail do |l|
             lines << l
           end
         end
-      rescue TimeoutError
+      rescue Timeout::Error
       end
     end
     appender = Thread.new do
@@ -194,12 +194,12 @@ def test_tail_remove
     lines = []
     logger = Thread.new do
       begin
-        timeout(2) do
+        Timeout::timeout(2) do
           @in.tail do |l|
             lines << l
           end
         end
-      rescue TimeoutError
+      rescue Timeout::Error
       end
     end
     appender = Thread.new do
@@ -225,12 +225,12 @@ def test_tail_remove2
     lines = []
     logger = Thread.new do
       begin
-        timeout(2) do
+        Timeout::timeout(2) do
           @in.tail do |l|
             lines << l
           end
         end
-      rescue TimeoutError
+      rescue Timeout::Error
       end
     end
     appender = Thread.new do
@@ -261,12 +261,12 @@ def test_tail_remove3
     lines = []
     logger = Thread.new do
       begin
-        timeout(2) do
+        Timeout::timeout(2) do
           @in.tail(15) do |l|
             lines << l
           end
         end
-      rescue TimeoutError
+      rescue Timeout::Error
       end
     end
     appender = Thread.new do
@@ -298,12 +298,12 @@ def test_tail_change
     lines = []
     logger = Thread.new do
       begin
-        timeout(2) do
+        Timeout::timeout(2) do
           @in.tail(110) do |l|
             lines << l
           end
         end
-      rescue TimeoutError
+      rescue Timeout::Error
       end
     end
     appender = Thread.new do
@@ -331,12 +331,12 @@ def test_tail_change2
     lines = []
     logger = Thread.new do
       begin
-        timeout(2) do
+        Timeout::timeout(2) do
           @in.tail(110) do |l|
             lines << l
           end
         end
-      rescue TimeoutError
+      rescue Timeout::Error
       end
     end
     appender = Thread.new do