[rubygem-mono_logger] Patch for Minitest 5 support (RHBZ #1107169)
Ken Dreyer
ktdreyer at fedoraproject.org
Fri Jul 11 23:43:47 UTC 2014
commit a7a58b128f04e5acafa9f0d4df7705ca8770a5ad
Author: Ken Dreyer <ktdreyer at ktdreyer.com>
Date: Fri Jul 11 17:43:38 2014 -0600
Patch for Minitest 5 support (RHBZ #1107169)
rubygem-mono_logger-1.1.0-minitest.patch | 77 ++++++++++++++++++++++++++++++
rubygem-mono_logger.spec | 13 ++++-
2 files changed, 88 insertions(+), 2 deletions(-)
---
diff --git a/rubygem-mono_logger-1.1.0-minitest.patch b/rubygem-mono_logger-1.1.0-minitest.patch
new file mode 100644
index 0000000..93e6f1e
--- /dev/null
+++ b/rubygem-mono_logger-1.1.0-minitest.patch
@@ -0,0 +1,77 @@
+commit efe352d3aca49353ac785440d3f731d5aea2fb8a
+Author: Ken Dreyer <ktdreyer at ktdreyer.com>
+Date: Thu Jul 10 18:15:01 2014 -0600
+
+ Fedora: tests: switch to Minitest 5
+
+ Update the test suite to use the new Minitest 5 framework API. Remove
+ the last references to Test::Unit and standardize on "Minitest"
+ everywhere.
+
+ This is a Fedora-specific cherry-pick from the upstream submission at
+ https://github.com/steveklabnik/mono_logger/pull/3
+
+diff --git a/test/mri_logger_test.rb b/test/mri_logger_test.rb
+index d46b6b4..55212b7 100644
+--- a/test/mri_logger_test.rb
++++ b/test/mri_logger_test.rb
+@@ -1,12 +1,19 @@
+ # coding: US-ASCII
+-require 'test/unit'
++require 'minitest/autorun'
+ require 'mono_logger'
+ require 'tempfile'
+
++if defined? Minitest::Test
++ # We're on Minitest 5+. Nothing to do here.
++else
++ # Minitest 4 doesn't have Minitest::Test yet.
++ Minitest::Test = MiniTest::Unit::TestCase
++end
++
+ Logger = MonoLogger
+
+
+-class TestLoggerSeverity < Test::Unit::TestCase
++class TestLoggerSeverity < Minitest::Test
+ def test_enum
+ logger_levels = Logger.constants
+ levels = ["WARN", "UNKNOWN", "INFO", "FATAL", "DEBUG", "ERROR"]
+@@ -19,7 +26,7 @@ class TestLoggerSeverity < Test::Unit::TestCase
+ end
+
+
+-class TestLogger < Test::Unit::TestCase
++class TestLogger < Minitest::Test
+ include Logger::Severity
+
+ def setup
+@@ -260,7 +267,7 @@ class TestLogger < Test::Unit::TestCase
+ end
+ end
+
+-class TestLogDevice < Test::Unit::TestCase
++class TestLogDevice < Minitest::Test
+ class LogExcnRaiser
+ def write(*arg)
+ raise 'disk is full'
+@@ -334,9 +341,7 @@ class TestLogDevice < Test::Unit::TestCase
+ end
+ $stderr, stderr = stderr, $stderr
+ begin
+- assert_nothing_raised do
+- logdev.write('hello')
+- end
++ logdev.write('hello')
+ ensure
+ logdev.close
+ $stderr, stderr = stderr, $stderr
+@@ -481,7 +486,7 @@ class TestLogDevice < Test::Unit::TestCase
+ end
+
+
+-class TestLoggerApplication < Test::Unit::TestCase
++class TestLoggerApplication < Minitest::Test
+ def setup
+ @app = Logger::Application.new('appname')
+ @tempfile = Tempfile.new("logger")
diff --git a/rubygem-mono_logger.spec b/rubygem-mono_logger.spec
index 38a14cf..1e31a97 100644
--- a/rubygem-mono_logger.spec
+++ b/rubygem-mono_logger.spec
@@ -2,12 +2,15 @@
Name: rubygem-%{gem_name}
Version: 1.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A lock-free logger compatible with Ruby 2.0
Group: Development/Languages
License: MIT
URL: https://github.com/steveklabnik/mono_logger
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
+# Minitest 5 support
+# https://github.com/steveklabnik/mono_logger/pull/3
+Patch0: rubygem-mono_logger-1.1.0-minitest.patch
Requires: ruby(release)
Requires: ruby(rubygems)
BuildRequires: ruby(release)
@@ -38,6 +41,9 @@ gem unpack %{SOURCE0}
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+# Minitest 5 support
+%patch0 -p1
+
# Remove developer-only files.
for f in Gemfile Rakefile; do
rm $f
@@ -60,7 +66,7 @@ cp -pa .%{gem_dir}/* \
%check
pushd .%{gem_instdir}
- testrb -Ilib test/*_test.rb
+ ruby -Ilib test/*_test.rb
popd
@@ -78,6 +84,9 @@ popd
%exclude %{gem_instdir}/test
%changelog
+* Fri Jul 11 2014 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.1.0-3
+- Patch for Minitest 5 support (RHBZ #1107169)
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list