From 7fb9f59af1fafe9ec920728375aa97752512ed78 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Apr 19 2016 08:12:15 +0000 Subject: Fix test suite for Ruby 2.3 compatibility. (rhbz#1308028) --- diff --git a/rubygem-file-tail-1.1.0-fix-test-for-ruby-2.3.patch b/rubygem-file-tail-1.1.0-fix-test-for-ruby-2.3.patch new file mode 100644 index 0000000..f483a63 --- /dev/null +++ b/rubygem-file-tail-1.1.0-fix-test-for-ruby-2.3.patch @@ -0,0 +1,222 @@ +From 6e32f9645718c66585ac9b751105c730fbf68534 Mon Sep 17 00:00:00 2001 +From: Jun Aruga +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 diff --git a/rubygem-file-tail.spec b/rubygem-file-tail.spec index f0a5d59..4f0e6a8 100644 --- a/rubygem-file-tail.spec +++ b/rubygem-file-tail.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Version: 1.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: File::Tail for Ruby Group: Development/Languages License: GPLv2 @@ -15,6 +15,10 @@ BuildRequires: ruby BuildRequires: rubygem(test-unit) BuildArch: noarch +# Ruby 2.3 tests compatibility +# https://github.com/flori/file-tail/pull/8.patch +Patch0: rubygem-file-tail-1.1.0-fix-test-for-ruby-2.3.patch + %description Library to tail files in Ruby. @@ -60,6 +64,7 @@ find %{buildroot}%{gem_instdir}/tests -type f | \ %check pushd .%{gem_instdir} +patch -p1 < %{PATCH0} ruby -Ilib -e 'Dir.glob "./tests/**/test_*.rb", &method(:require)' popd @@ -86,6 +91,9 @@ popd %changelog +* Mon Apr 18 2016 Jun Aruga - 1.1.0-3 +- Fix test suite for Ruby 2.3 compatibility. (rhbz#1308028) + * Thu Feb 04 2016 Fedora Release Engineering - 1.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild