From 68b232a2b3157a4ced19c0045d4c7a937e09b442 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sat, 11 Mar 2017 09:45:45 +0000
Subject: tests: switch to test-unit

test-unit has fewer incompatible changes over the years
than minitest; and minitest seems open to making future
incompatible changes... Nope.

I value API stability more and more as I (and this project)
ages.
---
 sleepy_penguin.gemspec           | 2 +-
 test/helper.rb                   | 9 ++-------
 test/test_cfr.rb                 | 4 +---
 test/test_constants.rb           | 6 ++----
 test/test_epoll.rb               | 8 ++------
 test/test_epoll_gc.rb            | 7 ++-----
 test/test_epoll_io.rb            | 7 ++-----
 test/test_epoll_optimizations.rb | 4 ++--
 test/test_eventfd.rb             | 7 ++-----
 test/test_inotify.rb             | 6 ++----
 test/test_kqueue.rb              | 7 ++-----
 test/test_kqueue_io.rb           | 7 ++-----
 test/test_sendfile.rb            | 4 +---
 test/test_splice.rb              | 4 +---
 test/test_splice_eintr.rb        | 5 +----
 test/test_timerfd.rb             | 7 ++-----
 16 files changed, 27 insertions(+), 67 deletions(-)

diff --git a/sleepy_penguin.gemspec b/sleepy_penguin.gemspec
index ea57014..9032fdd 100644
--- a/sleepy_penguin.gemspec
+++ b/sleepy_penguin.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.summary = summary
   s.test_files = Dir['test/test_*.rb']
   s.extensions = %w(ext/sleepy_penguin/extconf.rb)
-  s.add_development_dependency('minitest', '~> 5.0')
+  s.add_development_dependency('test-unit', '~> 3.0')
   s.add_development_dependency('olddoc', '~> 1.0')
   s.add_development_dependency('strace_me', '~> 1.0')
 
diff --git a/test/helper.rb b/test/helper.rb
index 8261168..fa53580 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,11 +1,6 @@
 $-w = $stdout.sync = $stderr.sync = Thread.abort_on_exception = true
-gem 'minitest'
-require 'minitest/autorun'
-Testcase = begin
-  Minitest::Test # minitest 5
-rescue NameError
-  Minitest::Unit::TestCase # minitest 4
-end
+require 'test/unit'
+require 'sleepy_penguin'
 
 def check_cloexec(io)
   pipe = IO.pipe
diff --git a/test/test_cfr.rb b/test/test_cfr.rb
index 0775c0f..0a7113d 100644
--- a/test/test_cfr.rb
+++ b/test/test_cfr.rb
@@ -1,8 +1,6 @@
 # -*- encoding: binary -*-
-require 'test/unit'
+require_relative 'helper'
 require 'tempfile'
-$-w = true
-require 'sleepy_penguin'
 
 class TestCfr < Test::Unit::TestCase
   def test_copy_file_range
diff --git a/test/test_constants.rb b/test/test_constants.rb
index 4e0c90b..a15ae5e 100644
--- a/test/test_constants.rb
+++ b/test/test_constants.rb
@@ -1,9 +1,7 @@
-require './test/helper'
-$-w = true
-Thread.abort_on_exception = true
+require_relative 'helper'
 require 'sleepy_penguin/sp'
 
-class TestConstants < Testcase
+class TestConstants < Test::Unit::TestCase
   def test_constants
     assert_equal SleepyPenguin::SLEEPY_PENGUIN_VERSION,
                  SP::SLEEPY_PENGUIN_VERSION
diff --git a/test/test_epoll.rb b/test/test_epoll.rb
index 48dd0ad..d2b560c 100644
--- a/test/test_epoll.rb
+++ b/test/test_epoll.rb
@@ -1,13 +1,9 @@
-require './test/helper'
+require_relative 'helper'
 require 'fcntl'
 require 'socket'
 require 'thread'
-$-w = true
-Thread.abort_on_exception = true
 
-require 'sleepy_penguin'
-
-class TestEpoll < Testcase
+class TestEpoll < Test::Unit::TestCase
   include SleepyPenguin
 
   def setup
diff --git a/test/test_epoll_gc.rb b/test/test_epoll_gc.rb
index e2f0e10..cebf24e 100644
--- a/test/test_epoll_gc.rb
+++ b/test/test_epoll_gc.rb
@@ -1,9 +1,6 @@
-require './test/helper'
-$-w = true
+require_relative 'helper'
 
-require 'sleepy_penguin'
-
-class TestEpollGC < Testcase
+class TestEpollGC < Test::Unit::TestCase
   include SleepyPenguin
 
   def setup
diff --git a/test/test_epoll_io.rb b/test/test_epoll_io.rb
index 5452de1..d749158 100644
--- a/test/test_epoll_io.rb
+++ b/test/test_epoll_io.rb
@@ -1,12 +1,9 @@
-require './test/helper'
+require_relative 'helper'
 require 'fcntl'
 require 'socket'
 require 'thread'
-$-w = true
-Thread.abort_on_exception = true
-require 'sleepy_penguin'
 
-class TestEpollIO < Testcase
+class TestEpollIO < Test::Unit::TestCase
   include SleepyPenguin
 
   def setup
diff --git a/test/test_epoll_optimizations.rb b/test/test_epoll_optimizations.rb
index 4a7f787..15d3da4 100644
--- a/test/test_epoll_optimizations.rb
+++ b/test/test_epoll_optimizations.rb
@@ -1,4 +1,4 @@
-require './test/helper'
+require_relative 'helper'
 begin
   require 'strace'
 rescue LoadError
@@ -7,7 +7,7 @@ $-w = true
 
 require 'sleepy_penguin'
 
-class TestEpollOptimizations < Testcase
+class TestEpollOptimizations < Test::Unit::TestCase
   include SleepyPenguin
   IO_PURGATORY = []
 
diff --git a/test/test_eventfd.rb b/test/test_eventfd.rb
index a6b3016..1611dd8 100644
--- a/test/test_eventfd.rb
+++ b/test/test_eventfd.rb
@@ -1,10 +1,7 @@
-require './test/helper'
+require_relative 'helper'
 require 'fcntl'
-$-w = true
 
-require 'sleepy_penguin'
-
-class TestEventFD < Testcase
+class TestEventFD < Test::Unit::TestCase
   include SleepyPenguin
 
   def test_constants
diff --git a/test/test_inotify.rb b/test/test_inotify.rb
index 895e13b..3e44283 100644
--- a/test/test_inotify.rb
+++ b/test/test_inotify.rb
@@ -1,11 +1,9 @@
-require './test/helper'
+require_relative 'helper'
 require 'fcntl'
 require 'tempfile'
 require 'set'
-$-w = true
-require 'sleepy_penguin'
 
-class TestInotify < Testcase
+class TestInotify < Test::Unit::TestCase
   include SleepyPenguin
   attr_reader :ino
 
diff --git a/test/test_kqueue.rb b/test/test_kqueue.rb
index 5131760..fc59d60 100644
--- a/test/test_kqueue.rb
+++ b/test/test_kqueue.rb
@@ -1,9 +1,6 @@
-require './test/helper'
-$-w = true
-Thread.abort_on_exception = true
-require 'sleepy_penguin'
+require_relative 'helper'
 
-class TestKqueue < Testcase
+class TestKqueue < Test::Unit::TestCase
   include SleepyPenguin
 
   def test_kqueue
diff --git a/test/test_kqueue_io.rb b/test/test_kqueue_io.rb
index 65f2443..7df145d 100644
--- a/test/test_kqueue_io.rb
+++ b/test/test_kqueue_io.rb
@@ -1,9 +1,6 @@
-require './test/helper'
-$-w = true
-Thread.abort_on_exception = true
-require 'sleepy_penguin'
+require_relative 'helper'
 
-class TestKqueueIO < Testcase
+class TestKqueueIO < Test::Unit::TestCase
   include SleepyPenguin
 
   def setup
diff --git a/test/test_sendfile.rb b/test/test_sendfile.rb
index a25b711..7fafef3 100644
--- a/test/test_sendfile.rb
+++ b/test/test_sendfile.rb
@@ -1,9 +1,7 @@
 # -*- encoding: binary -*-
-require 'test/unit'
+require_relative 'helper'
 require 'tempfile'
 require 'socket'
-$-w = true
-require 'sleepy_penguin'
 
 class TestSendfile < Test::Unit::TestCase
   def test_linux_sendfile
diff --git a/test/test_splice.rb b/test/test_splice.rb
index 266f52b..94354a2 100644
--- a/test/test_splice.rb
+++ b/test/test_splice.rb
@@ -1,11 +1,9 @@
 # -*- encoding: binary -*-
-require 'test/unit'
+require_relative 'helper'
 require 'tempfile'
 require 'socket'
 require 'io/nonblock'
 require 'timeout'
-$-w = true
-require 'sleepy_penguin'
 
 class TestSplice < Test::Unit::TestCase
 
diff --git a/test/test_splice_eintr.rb b/test/test_splice_eintr.rb
index fb2dbbc..9234d4c 100644
--- a/test/test_splice_eintr.rb
+++ b/test/test_splice_eintr.rb
@@ -1,11 +1,8 @@
 # -*- encoding: binary -*-
-require 'test/unit'
+require_relative 'helper'
 require 'tempfile'
 require 'socket'
-require 'sleepy_penguin'
 require 'timeout'
-$-w = true
-Thread.abort_on_exception = true
 
 class Test_Splice_EINTR < Test::Unit::TestCase
   def setup
diff --git a/test/test_timerfd.rb b/test/test_timerfd.rb
index 6189168..a5198bf 100644
--- a/test/test_timerfd.rb
+++ b/test/test_timerfd.rb
@@ -1,10 +1,7 @@
-require './test/helper'
+require_relative 'helper'
 require 'fcntl'
-$-w = true
 
-require 'sleepy_penguin'
-
-class TestTimerFD < Testcase
+class TestTimerFD < Test::Unit::TestCase
   include SleepyPenguin
 
   def test_constants
-- 
cgit v1.2.3-24-ge0c7