Fix sha1 test, dry up "remove ./tmp/foo" preparations

refs #1646

diff --git a/sdk/cli/test/test_arv-get.rb b/sdk/cli/test/test_arv-get.rb
index 660114b6d45b65c8adcc0655d51e47e91bed2331..1cc64b6db67d40d53f9080d67de15ad551b5af28 100644 (file)
--- a/sdk/cli/test/test_arv-get.rb
+++ b/sdk/cli/test/test_arv-get.rb
@@ -42,10 +42,7 @@ class TestArvGet < Minitest::Test
   end
 
   def test_file_to_file
-    begin
-      File.unlink('tmp/foo')
-    rescue Errno::ENOENT
-    end
+    remove_tmp_foo
     out, err = capture_subprocess_io do
       assert_arv_get @@foo_manifest_locator + '/foo', 'tmp/foo'
     end
@@ -55,10 +52,7 @@ class TestArvGet < Minitest::Test
   end
 
   def test_manifest_root_to_dir
-    begin
-      File.unlink('tmp/foo')
-    rescue Errno::ENOENT
-    end
+    remove_tmp_foo
     out, err = capture_subprocess_io do
       assert_arv_get '-r', @@foo_manifest_locator + '/', 'tmp/'
     end
@@ -68,10 +62,7 @@ class TestArvGet < Minitest::Test
   end
 
   def test_display_md5sum
-    begin
-      File.unlink('tmp/foo')
-    rescue Errno::ENOENT
-    end
+    remove_tmp_foo
     out, err = capture_subprocess_io do
       assert_arv_get '-r', '--md5sum', @@foo_manifest_locator + '/', 'tmp/'
     end
@@ -81,10 +72,7 @@ class TestArvGet < Minitest::Test
   end
 
   def test_md5sum_nowrite
-    begin
-      File.unlink('tmp/foo')
-    rescue Errno::ENOENT
-    end
+    remove_tmp_foo
     out, err = capture_subprocess_io do
       assert_arv_get '-n', '--md5sum', @@foo_manifest_locator + '/', 'tmp/'
     end
@@ -94,6 +82,7 @@ class TestArvGet < Minitest::Test
   end
 
   def test_sha1_nowrite
+    remove_tmp_foo
     out, err = capture_subprocess_io do
       assert_arv_get '-n', '-r', '--hash', 'sha1', @@foo_manifest_locator+'/', 'tmp/'
     end
@@ -103,10 +92,7 @@ class TestArvGet < Minitest::Test
   end
 
   def test_block_to_file
-    begin
-      File.unlink('tmp/foo')
-    rescue Errno::ENOENT
-    end
+    remove_tmp_foo
     out, err = capture_subprocess_io do
       assert_arv_get @@foo_manifest_locator, 'tmp/foo'
     end
@@ -155,4 +141,11 @@ class TestArvGet < Minitest::Test
   def foo_manifest
     ". #{Digest::MD5.hexdigest('foo')}+3 0:3:foo\n"
   end
+
+  def remove_tmp_foo
+    begin
+      File.unlink('tmp/foo')
+    rescue Errno::ENOENT
+    end
+  end
 end