X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/343892aa0ef79cf607abbfd85a04a612990022e1..e8d1a643cdbc3a5f4c0e5c745da58d9f7e1248d8:/sdk/cli/test/test_arv-tag.rb

diff --git a/sdk/cli/test/test_arv-tag.rb b/sdk/cli/test/test_arv-tag.rb
index c095de5089..895d0559e5 100644
--- a/sdk/cli/test/test_arv-tag.rb
+++ b/sdk/cli/test/test_arv-tag.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 require 'minitest/autorun'
 require 'digest/md5'
 require 'json'
@@ -9,24 +13,28 @@ end
 class TestArvTag < Minitest::Test
 
   def test_no_args
+    skip "Waiting until #4534 is implemented"
+
     # arv-tag exits with failure if run with no args
     out, err = capture_subprocess_io do
       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.
   def test_single_tag_single_obj
+    skip "TBD"
+
     # Add a single tag.
     tag_uuid, err = capture_subprocess_io do
-      assert arv_tag 'add', 'test_tag1', '--object', 'uuid1'
+      assert arv_tag '--short', 'add', 'test_tag1', '--object', 'uuid1'
     end
     assert_empty err
 
     out, err = capture_subprocess_io do
-      assert arv '-h', 'link', 'show', '--uuid', tag_uuid.rstrip
+      assert arv 'link', 'show', '--uuid', tag_uuid.rstrip
     end
 
     assert_empty err
@@ -35,7 +43,7 @@ class TestArvTag < Minitest::Test
 
     # Remove the tag.
     out, err = capture_subprocess_io do
-      assert arv_tag '-h', 'remove', 'test_tag1', '--object', 'uuid1'
+      assert arv_tag 'remove', 'test_tag1', '--object', 'uuid1'
     end
 
     assert_empty err
@@ -45,7 +53,7 @@ class TestArvTag < Minitest::Test
 
     # Verify that the link no longer exists.
     out, err = capture_subprocess_io do
-      assert_equal false, arv('-h', 'link', 'show', '--uuid', links[0]['uuid'])
+      assert_equal false, arv('link', 'show', '--uuid', links[0]['uuid'])
     end
 
     assert_equal "Error: Path not found\n", err
@@ -53,6 +61,8 @@ class TestArvTag < Minitest::Test
 
   # Test adding and removing a single tag with multiple objects.
   def test_single_tag_multi_objects
+    skip "TBD"
+
     out, err = capture_subprocess_io do
       assert arv_tag('add', 'test_tag1',
                      '--object', 'uuid1',
@@ -62,7 +72,7 @@ class TestArvTag < Minitest::Test
     assert_empty err
 
     out, err = capture_subprocess_io do
-      assert arv '-h', 'link', 'list', '--where', '{"link_class":"tag","name":"test_tag1"}'
+      assert arv 'link', 'list', '--where', '{"link_class":"tag","name":"test_tag1"}'
     end
 
     assert_empty err