From e6e9cef06e9023a80991518297d9f2c0c12488ce Mon Sep 17 00:00:00 2001 From: Samuel Williams Date: Thu, 16 Jul 2020 15:19:47 +1200 Subject: Improve consistency of tests. --- test/fiber/scheduler.rb | 1 + test/fiber/test_enumerator.rb | 6 +++--- test/fiber/test_io.rb | 11 +++++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/fiber/scheduler.rb b/test/fiber/scheduler.rb index 820f441dcd..740496674a 100644 --- a/test/fiber/scheduler.rb +++ b/test/fiber/scheduler.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require 'fiber' +require 'socket' begin require 'io/nonblock' diff --git a/test/fiber/test_enumerator.rb b/test/fiber/test_enumerator.rb index d332726dc3..f88657cdc4 100644 --- a/test/fiber/test_enumerator.rb +++ b/test/fiber/test_enumerator.rb @@ -1,19 +1,19 @@ # frozen_string_literal: true require 'test/unit' -require 'socket' require_relative 'scheduler' class TestFiberEnumerator < Test::Unit::TestCase MESSAGE = "Hello World" def test_read_characters - skip unless defined?(UNIXSocket) + skip "UNIXSocket is not defined!" unless defined?(UNIXSocket) i, o = UNIXSocket.pair + unless i.nonblock? && o.nonblock? i.close o.close - skip + skip "I/O is not non-blocking!" end message = String.new diff --git a/test/fiber/test_io.rb b/test/fiber/test_io.rb index e7f06f7429..bf200061d8 100644 --- a/test/fiber/test_io.rb +++ b/test/fiber/test_io.rb @@ -6,10 +6,15 @@ class TestFiberIO < Test::Unit::TestCase MESSAGE = "Hello World" def test_read - skip unless defined?(UNIXSocket) + skip "UNIXSocket is not defined!" unless defined?(UNIXSocket) i, o = UNIXSocket.pair - skip unless i.nonblock? && o.nonblock? + + unless i.nonblock? && o.nonblock? + i.close + o.close + skip "I/O is not non-blocking!" + end message = nil @@ -31,5 +36,7 @@ class TestFiberIO < Test::Unit::TestCase thread.join assert_equal MESSAGE, message + assert_predicate(i, :closed?) + assert_predicate(o, :closed?) end end -- cgit v1.2.3