ruby-changes:67991
From: Hiroshi <ko1@a...>
Date: Wed, 15 Sep 2021 08:53:44 +0900 (JST)
Subject: [ruby-changes:67991] 8f6b42e0cb (master): [ruby/logger] Ignored loading CoreAssertions in test runner
https://git.ruby-lang.org/ruby.git/commit/?id=8f6b42e0cb From 8f6b42e0cb5c41255b51d1d09086eb7748f9ac69 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> 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 diff --git a/test/logger/helper.rb b/test/logger/helper.rb deleted file mode 100644 index 9eaeb20..0000000 --- a/test/logger/helper.rb +++ /dev/null @@ -1,13 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/#L0 -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 6fefd35..d360fa2 100644 --- a/test/logger/test_logdevice.rb +++ b/test/logger/test_logdevice.rb @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/logger/test_logdevice.rb#L1 # 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 4bbfd52..3281d17 100644 --- a/test/logger/test_logger.rb +++ b/test/logger/test_logger.rb @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/logger/test_logger.rb#L1 # 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 3c5cbbc..6e6e5e9 100644 --- a/test/logger/test_logperiod.rb +++ b/test/logger/test_logperiod.rb @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/logger/test_logperiod.rb#L1 # 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 1197e8a..dad6347 100644 --- a/test/logger/test_severity.rb +++ b/test/logger/test_severity.rb @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/logger/test_severity.rb#L1 # coding: US-ASCII # frozen_string_literal: false -require_relative 'helper' +require 'logger' class TestLoggerSeverity < Test::Unit::TestCase def test_enum -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/