From 8f6b42e0cb5c41255b51d1d09086eb7748f9ac69 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Tue, 14 Sep 2021 20:53:07 +0900
Subject: [ruby/logger] Ignored loading CoreAssertions in test runner

https://github.com/ruby/logger/commit/2fd5401ad6
---
 test/logger/helper.rb         | 13 -------------
 test/logger/test_logdevice.rb |  2 +-
 test/logger/test_logger.rb    |  2 +-
 test/logger/test_logperiod.rb |  2 +-
 test/logger/test_severity.rb  |  2 +-
 5 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 test/logger/helper.rb

(limited to 'test')

diff --git a/test/logger/helper.rb b/test/logger/helper.rb
deleted file mode 100644
index 9eaeb205b0..0000000000
--- a/test/logger/helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-ROOT_DIR = File.dirname(__dir__)
-$LOAD_PATH.unshift File.join(ROOT_DIR, 'lib') # to use logger in this repo instead of ruby built-in logger
-$LOAD_PATH.unshift File.join(ROOT_DIR, 'test', 'lib') # to use custom test-unit in this repo
-require 'logger'
-require 'test/unit'
-
-begin
-  # for standalone test suite on ruby/logger
-  require 'core_assertions'
-
-  Test::Unit::TestCase.include Test::Unit::CoreAssertions
-rescue LoadError
-end
diff --git a/test/logger/test_logdevice.rb b/test/logger/test_logdevice.rb
index 6fefd356cd..d360fa2107 100644
--- a/test/logger/test_logdevice.rb
+++ b/test/logger/test_logdevice.rb
@@ -1,6 +1,6 @@
 # coding: US-ASCII
 # frozen_string_literal: false
-require_relative 'helper'
+require 'logger'
 require 'tempfile'
 require 'tmpdir'
 
diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb
index 4bbfd523c0..3281d17c7b 100644
--- a/test/logger/test_logger.rb
+++ b/test/logger/test_logger.rb
@@ -1,6 +1,6 @@
 # coding: US-ASCII
 # frozen_string_literal: false
-require_relative 'helper'
+require 'logger'
 require 'tempfile'
 
 class TestLogger < Test::Unit::TestCase
diff --git a/test/logger/test_logperiod.rb b/test/logger/test_logperiod.rb
index 3c5cbbcd9b..6e6e5e9533 100644
--- a/test/logger/test_logperiod.rb
+++ b/test/logger/test_logperiod.rb
@@ -1,6 +1,6 @@
 # coding: US-ASCII
 # frozen_string_literal: false
-require_relative 'helper'
+require 'logger'
 require 'time'
 
 class TestLogPeriod < Test::Unit::TestCase
diff --git a/test/logger/test_severity.rb b/test/logger/test_severity.rb
index 1197e8abb9..dad63472a6 100644
--- a/test/logger/test_severity.rb
+++ b/test/logger/test_severity.rb
@@ -1,6 +1,6 @@
 # coding: US-ASCII
 # frozen_string_literal: false
-require_relative 'helper'
+require 'logger'
 
 class TestLoggerSeverity < Test::Unit::TestCase
   def test_enum
-- 
cgit v1.2.3