15673: Fix ruby warnings.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/sdk/cli/test/test_arv-collection-create.rb b/sdk/cli/test/test_arv-collection-create.rb
index 237b2107f85f2607509893906052b72c965d8d32..39c50bcc837653d975e308a3ae9b567aa759a12b 100644 (file)
--- a/sdk/cli/test/test_arv-collection-create.rb
+++ b/sdk/cli/test/test_arv-collection-create.rb
@@ -20,7 +20,7 @@ class TestCollectionCreate < Minitest::Test
                    manifest_text: foo_manifest
                  }.to_json)
     end
-    assert /^([0-9a-z]{5}-4zz18-[0-9a-z]{15})?$/.match(out)
+    assert(/^([0-9a-z]{5}-4zz18-[0-9a-z]{15})?$/.match(out))
     assert_equal '', err
   end
 
@@ -33,7 +33,7 @@ class TestCollectionCreate < Minitest::Test
         assert_arv('--format', 'uuid',
                    'collection', 'create', '--collection', tempfile.path)
       end
-      assert /^([0-9a-z]{5}-4zz18-[0-9a-z]{15})?$/.match(out)
+      assert(/^([0-9a-z]{5}-4zz18-[0-9a-z]{15})?$/.match(out))
       assert_equal '', err
     ensure
       tempfile.unlink

diff --git a/sdk/cli/test/test_arv-keep-get.rb b/sdk/cli/test/test_arv-keep-get.rb
index 2aa1e67248f2d01258a8241edd176d9aa9929425..f92e51b298c65c4dbebd04bf8b36903c18a25861 100644 (file)
--- a/sdk/cli/test/test_arv-keep-get.rb
+++ b/sdk/cli/test/test_arv-keep-get.rb
@@ -21,7 +21,7 @@ class TestArvKeepGet < Minitest::Test
       assert_arv_get false
     end
     assert_equal '', out
-    assert_match /^usage:/, err
+    assert_match(/^usage:/, err)
   end
 
   def test_get_version
@@ -38,7 +38,7 @@ class TestArvKeepGet < Minitest::Test
     end
     $stderr.write err
     assert_equal '', err
-    assert_match /^usage:/, out
+    assert_match(/^usage:/, out)
   end
 
   def test_file_to_dev_stdout
@@ -70,7 +70,7 @@ class TestArvKeepGet < Minitest::Test
     out, err = capture_subprocess_io do
       assert_arv_get false, @@foo_manifest_locator + '/foo', 'tmp/foo'
     end
-    assert_match /Local file tmp\/foo already exists/, err
+    assert_match(/Local file tmp\/foo already exists/, err)
     assert_equal '', out
     assert_equal 'baz', IO.read('tmp/foo')
   end
@@ -82,7 +82,7 @@ class TestArvKeepGet < Minitest::Test
     out, err = capture_subprocess_io do
       assert_arv_get false, @@foo_manifest_locator + '/', 'tmp/'
     end
-    assert_match /Local file tmp\/foo already exists/, err
+    assert_match(/Local file tmp\/foo already exists/, err)
     assert_equal '', out
     assert_equal 'baz', IO.read('tmp/foo')
   end
@@ -128,7 +128,7 @@ class TestArvKeepGet < Minitest::Test
       assert_arv_get false, @@foo_manifest_locator + '/', 'tmp/foo'
     end
     assert_equal '', out
-    assert_match /^usage:/, err
+    assert_match(/^usage:/, err)
   end
 
   def test_dir_to_empty_string
@@ -136,7 +136,7 @@ class TestArvKeepGet < Minitest::Test
       assert_arv_get false, @@foo_manifest_locator + '/', ''
     end
     assert_equal '', out
-    assert_match /^usage:/, err
+    assert_match(/^usage:/, err)
   end
 
   def test_nonexistent_block
@@ -144,7 +144,7 @@ class TestArvKeepGet < Minitest::Test
       assert_arv_get false, 'e796ab2294f3e48ec709ffa8d6daf58c'
     end
     assert_equal '', out
-    assert_match /ERROR:/, err
+    assert_match(/ERROR:/, err)
   end
 
   def test_nonexistent_manifest
@@ -152,7 +152,7 @@ class TestArvKeepGet < Minitest::Test
       assert_arv_get false, 'acbd18db4cc2f85cedef654fccc4a4d8/', 'tmp/'
     end
     assert_equal '', out
-    assert_match /ERROR:/, err
+    assert_match(/ERROR:/, err)
   end
 
   def test_manifest_root_to_dir

diff --git a/sdk/cli/test/test_arv-keep-put.rb b/sdk/cli/test/test_arv-keep-put.rb
index 9ac722f6733dff2d5991ea8670ee420b316f0bbe..9fec78e34973f831dcd55dadb335c54a541615ed 100644 (file)
--- a/sdk/cli/test/test_arv-keep-put.rb
+++ b/sdk/cli/test/test_arv-keep-put.rb
@@ -22,7 +22,7 @@ class TestArvKeepPut < Minitest::Test
     end
     $stderr.write err
     assert_empty err
-    assert_match /^usage:/, out
+    assert_match(/^usage:/, out)
   end
 
   def test_raw_stdin
@@ -65,7 +65,7 @@ class TestArvKeepPut < Minitest::Test
       assert_equal(false, arv_put('--filename', 'foo', './tmp/empty_dir/.'),
                    'arv-put --filename refuses directory')
     end
-    assert_match /^usage:.*error:/m, err
+    assert_match(/^usage:.*error:/m, err)
     assert_empty out
   end
 
@@ -76,7 +76,7 @@ class TestArvKeepPut < Minitest::Test
                                   './tmp/empty_file'),
                    'arv-put --filename refuses directory')
     end
-    assert_match /^usage:.*error:/m, err
+    assert_match(/^usage:.*error:/m, err)
     assert_empty out
   end
 
@@ -102,7 +102,7 @@ class TestArvKeepPut < Minitest::Test
     out, err = capture_subprocess_io do
       assert arv_put('--no-cache', '--manifest', '--progress', './tmp/foo')
     end
-    assert_match /%/, err
+    assert_match(/%/, err)
     assert match_collection_uuid(out)
   end
 
@@ -110,8 +110,8 @@ class TestArvKeepPut < Minitest::Test
     out, err = capture_subprocess_io do
       assert arv_put('--no-cache', '--manifest', '--batch-progress', './tmp/foo')
     end
-    assert_match /: 0 written 3 total/, err
-    assert_match /: 3 written 3 total/, err
+    assert_match(/: 0 written 3 total/, err)
+    assert_match(/: 3 written 3 total/, err)
     assert match_collection_uuid(out)
   end
 
@@ -121,7 +121,7 @@ class TestArvKeepPut < Minitest::Test
                    arv_put('--progress', '--batch-progress', './tmp/foo'),
                    'arv-put --progress --batch-progress is contradictory')
     end
-    assert_match /^usage:.*error:/m, err
+    assert_match(/^usage:.*error:/m, err)
     assert_empty out
   end
 

diff --git a/sdk/cli/test/test_arv-tag.rb b/sdk/cli/test/test_arv-tag.rb
index 16542ba16b4fbb649722bc7de1a2388e30225188..895d0559e541b7da526c0cdd7961f4a09e737b30 100644 (file)
--- a/sdk/cli/test/test_arv-tag.rb
+++ b/sdk/cli/test/test_arv-tag.rb
@@ -20,7 +20,7 @@ class TestArvTag < Minitest::Test
       assert_equal false, arv_tag
     end
     assert_empty out
-    assert_match /^usage:/i, err
+    assert_match(/^usage:/i, err)
   end
 
   # Test adding and removing a single tag on a single object.

diff --git a/sdk/cli/test/test_arv-ws.rb b/sdk/cli/test/test_arv-ws.rb
index ffdb8656b41259362009c256d91c0661a9855d0d..49aac8a640206532259acb577b9f8a4751be24b0 100644 (file)
--- a/sdk/cli/test/test_arv-ws.rb
+++ b/sdk/cli/test/test_arv-ws.rb
@@ -9,14 +9,14 @@ class TestArvWs < Minitest::Test
   end
 
   def test_arv_ws_get_help
-    out, err = capture_subprocess_io do
+    _, err = capture_subprocess_io do
       system ('arv-ws -h')
     end
     assert_equal '', err
   end
 
   def test_arv_ws_such_option
-    out, err = capture_subprocess_io do
+    _, err = capture_subprocess_io do
       system ('arv-ws --junk')
     end
     refute_equal '', err