https://git.ruby-lang.org/ruby.git/commit/?id=5331615d54

From 5331615d546169f1c90014a3cd2964e6d3dd0420 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Tue, 11 Jan 2022 21:19:26 +0900
Subject: [ruby/win32ole] Use omit instead of skip for test-unit

https://github.com/ruby/win32ole/commit/c0586b2f75
---
 test/win32ole/test_err_in_callback.rb       | 2 +-
 test/win32ole/test_win32ole_event.rb        | 2 +-
 test/win32ole/test_win32ole_method_event.rb | 2 +-
 test/win32ole/test_win32ole_param_event.rb  | 2 +-
 test/win32ole/test_win32ole_record.rb       | 2 +-
 test/win32ole/test_win32ole_type_event.rb   | 2 +-
 test/win32ole/test_word.rb                  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb
index 2c2b4a61a17..9ffaf9125fd 100644
--- a/test/win32ole/test_err_in_callback.rb
+++ b/test/win32ole/test_err_in_callback.rb
@@ -38,7 +38,7 @@ if defined?(WIN32OLE) https://github.com/ruby/ruby/blob/trunk/test/win32ole/test_err_in_callback.rb#L38
     end
 
     def test_err_in_callback
-      skip "'ADODB.Connection' is not available" unless available_adodb?
+      omit "'ADODB.Connection' is not available" unless available_adodb?
       if @ruby
         Dir.mktmpdir do |tmpdir|
           logfile = File.join(tmpdir, "test_err_in_callback.log")
diff --git a/test/win32ole/test_win32ole_event.rb b/test/win32ole/test_win32ole_event.rb
index fa9e7b5b080..f02df53be7a 100644
--- a/test/win32ole/test_win32ole_event.rb
+++ b/test/win32ole/test_win32ole_event.rb
@@ -136,7 +136,7 @@ if defined?(WIN32OLE_EVENT) https://github.com/ruby/ruby/blob/trunk/test/win32ole/test_win32ole_event.rb#L136
         @wmi.ExecNotificationQueryAsync(@sws, @sql)
       rescue => e
         if /OLE error code:80041008 in SWbemServicesEx/ =~ e.message
-          skip "No administrator privilege?"
+          omit "No administrator privilege?"
         end
         raise
       end
diff --git a/test/win32ole/test_win32ole_method_event.rb b/test/win32ole/test_win32ole_method_event.rb
index 6dad6ff2b47..77581688725 100644
--- a/test/win32ole/test_win32ole_method_event.rb
+++ b/test/win32ole/test_win32ole_method_event.rb
@@ -10,7 +10,7 @@ if defined?(WIN32OLE_METHOD) https://github.com/ruby/ruby/blob/trunk/test/win32ole/test_win32ole_method_event.rb#L10
   class TestWIN32OLE_METHOD_EVENT < Test::Unit::TestCase
     unless AvailableOLE.sysmon_available?
       def test_dummy_for_skip_message
-        skip 'System Monitor Control is not available'
+        omit 'System Monitor Control is not available'
       end
     else
       def setup
diff --git a/test/win32ole/test_win32ole_param_event.rb b/test/win32ole/test_win32ole_param_event.rb
index 64812e567db..a659a6d0f3e 100644
--- a/test/win32ole/test_win32ole_param_event.rb
+++ b/test/win32ole/test_win32ole_param_event.rb
@@ -23,7 +23,7 @@ if defined?(WIN32OLE_PARAM) https://github.com/ruby/ruby/blob/trunk/test/win32ole/test_win32ole_param_event.rb#L23
       end
     else
       def test_dummy_for_skip_message
-        skip 'ActiveX Data Object Library and MS XML not found'
+        omit 'ActiveX Data Object Library and MS XML not found'
       end
     end
   end
diff --git a/test/win32ole/test_win32ole_record.rb b/test/win32ole/test_win32ole_record.rb
index 7d6c3fb4af8..65fd5f6a3ca 100644
--- a/test/win32ole/test_win32ole_record.rb
+++ b/test/win32ole/test_win32ole_record.rb
@@ -76,7 +76,7 @@ if defined?(WIN32OLE_RECORD) https://github.com/ruby/ruby/blob/trunk/test/win32ole/test_win32ole_record.rb#L76
   class TestWIN32OLE_RECORD_BY_RBCOMTEST < Test::Unit::TestCase
     unless rbcomtest_exist?
       def test_dummy_for_skip_message
-        skip "#{PROGID_RBCOMTEST} for WIN32OLE_RECORD test is not installed"
+        omit "#{PROGID_RBCOMTEST} for WIN32OLE_RECORD test is not installed"
       end
     else
       def setup
diff --git a/test/win32ole/test_win32ole_type_event.rb b/test/win32ole/test_win32ole_type_event.rb
index ad2de54e59f..ec46245cae9 100644
--- a/test/win32ole/test_win32ole_type_event.rb
+++ b/test/win32ole/test_win32ole_type_event.rb
@@ -12,7 +12,7 @@ if defined?(WIN32OLE_TYPE) https://github.com/ruby/ruby/blob/trunk/test/win32ole/test_win32ole_type_event.rb#L12
   class TestWIN32OLE_TYPE_EVENT < Test::Unit::TestCase
     unless AvailableOLE.sysmon_available?
       def test_dummy_for_skip_message
-        skip 'System Monitor Control is not available'
+        omit 'System Monitor Control is not available'
       end
     else
 
diff --git a/test/win32ole/test_word.rb b/test/win32ole/test_word.rb
index b1cdb273cce..a23757f6208 100644
--- a/test/win32ole/test_word.rb
+++ b/test/win32ole/test_word.rb
@@ -35,7 +35,7 @@ if defined?(WIN32OLE) https://github.com/ruby/ruby/blob/trunk/test/win32ole/test_word.rb#L35
   class TestWIN32OLE_WITH_WORD < Test::Unit::TestCase
     unless word_installed?
       def test_dummy_for_skip_message
-        skip "Microsoft Word is not installed"
+        omit "Microsoft Word is not installed"
       end
     else
       def setup
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/