6592: 4534: Re-enable integration tests, now that run-tests.sh brings up an API server.

[arvados.git] / sdk / cli / test / test_arv-get.rb

diff --git a/sdk/cli/test/test_arv-get.rb b/sdk/cli/test/test_arv-get.rb
index 3d378e740c10f476df1d76a0f397276cd06f1fc6..5e58014cbfa10d3b9b67a8b7cddca8b8676f646c 100644 (file)
--- a/sdk/cli/test/test_arv-get.rb
+++ b/sdk/cli/test/test_arv-get.rb
@@ -58,7 +58,7 @@ class TestArvGet < Minitest::Test
     out, err = capture_subprocess_io do
       assert_arv_get false, @@foo_manifest_locator + '/foo', 'tmp/foo'
     end
-    assert_match /^ERROR:/, err
+    assert_match /Local file tmp\/foo already exists/, err
     assert_equal '', out
     assert_equal 'baz', IO.read('tmp/foo')
   end
@@ -70,7 +70,7 @@ class TestArvGet < Minitest::Test
     out, err = capture_subprocess_io do
       assert_arv_get false, @@foo_manifest_locator + '/', 'tmp/'
     end
-    assert_match /^ERROR:/, err
+    assert_match /Local file tmp\/foo already exists/, err
     assert_equal '', out
     assert_equal 'baz', IO.read('tmp/foo')
   end
@@ -129,18 +129,18 @@ class TestArvGet < Minitest::Test
 
   def test_nonexistent_block
     out, err = capture_subprocess_io do
-      assert_arv_get false, 'f1554a91e925d6213ce7c3103c5110c6'
+      assert_arv_get false, 'e796ab2294f3e48ec709ffa8d6daf58c'
     end
     assert_equal '', out
-    assert_match /^ERROR:/, err
+    assert_match /Error:/, err
   end
 
   def test_nonexistent_manifest
     out, err = capture_subprocess_io do
-      assert_arv_get false, 'f1554a91e925d6213ce7c3103c5110c6/', 'tmp/'
+      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
@@ -200,7 +200,9 @@ class TestArvGet < Minitest::Test
     end
     assert_equal '', err
     assert_equal '', out
-    assert_equal foo_manifest, IO.read('tmp/foo')
+
+    digest = Digest::MD5.hexdigest('foo')
+    !(IO.read('tmp/foo')).gsub!( /^(. #{digest}+3)(.*)( 0:3:foo)$/).nil?
   end
 
   def test_create_directory_tree
@@ -240,10 +242,6 @@ class TestArvGet < Minitest::Test
                  "should exit #{if expect then 0 else 'non-zero' end}")
   end
 
-  def foo_manifest
-    ". #{Digest::MD5.hexdigest('foo')}+3 0:3:foo\n"
-  end
-
   def remove_tmp_foo
     begin
       File.unlink('tmp/foo')