Merge pull request #41 from ruby/use-omit

Use omit instead of skip for test-unit
ruby · Sep 11, 2024 · b55d5ac · b55d5ac
2 parents 2b68532 + a281c81
commit b55d5ac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4

diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb
@@ -1834,7 +1834,7 @@ def test_tls_unknown_ca
                          :port => port,
                          :ssl => true)
           rescue SystemCallError
-            skip $!
+            omit $!
           end
         end
       end
@@ -1848,7 +1848,7 @@ def test_tls_with_ca_file
                          :port => port,
                          :ssl => { :ca_file => CA_FILE })
           rescue SystemCallError
-            skip $!
+            omit $!
           end
         end
       end
@@ -2270,7 +2270,7 @@ def test_abort_tls
   end
 
   def test_getbinaryfile_command_injection
-    skip "| is not allowed in filename on Windows" if windows?
+    omit "| is not allowed in filename on Windows" if windows?
     [false, true].each do |resume|
       commands = []
       binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3
@@ -2323,7 +2323,7 @@ def test_getbinaryfile_command_injection
   end
 
   def test_gettextfile_command_injection
-    skip "| is not allowed in filename on Windows" if windows?
+    omit "| is not allowed in filename on Windows" if windows?
     commands = []
     text_data = <<EOF.gsub(/\n/, "\r\n")
 foo
@@ -2384,7 +2384,7 @@ def test_gettextfile_command_injection
   end
 
   def test_putbinaryfile_command_injection
-    skip "| is not allowed in filename on Windows" if windows?
+    omit "| is not allowed in filename on Windows" if windows?
     commands = []
     binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3
     received_data = nil
@@ -2432,7 +2432,7 @@ def test_putbinaryfile_command_injection
   end
 
   def test_puttextfile_command_injection
-    skip "| is not allowed in filename on Windows" if windows?
+    omit "| is not allowed in filename on Windows" if windows?
     commands = []
     received_data = nil
     server = create_ftp_server { |sock|