14328: Merge branch 'master'

[arvados.git] / services / api / test / helpers / git_test_helper.rb

diff --git a/services/api/test/helpers/git_test_helper.rb b/services/api/test/helpers/git_test_helper.rb
index 6fce321953d3add8138056306629500927771f65..170b59ee1e10d833fd3a0cb0fb6a6aef87bbc123 100644 (file)
--- a/services/api/test/helpers/git_test_helper.rb
+++ b/services/api/test/helpers/git_test_helper.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'fileutils'
 require 'tmpdir'
 
@@ -22,18 +26,13 @@ module GitTestHelper
       FileUtils.mkdir_p @tmpdir
       system("tar", "-xC", @tmpdir.to_s, "-f", "test/test.git.tar")
       Rails.configuration.git_repositories_dir = "#{@tmpdir}/test"
-
-      intdir = Rails.configuration.git_internal_dir
-      if not File.exist? intdir
-        FileUtils.mkdir_p intdir
-        IO.read("|git --git-dir #{intdir.to_s.shellescape} init")
-        assert $?.success?
-      end
+      Rails.configuration.git_internal_dir = "#{@tmpdir}/internal.git"
     end
 
     base.teardown do
-      FileUtils.remove_entry @tmpdir, true
       FileUtils.remove_entry Commit.cache_dir_base, true
+      FileUtils.mkdir_p @tmpdir
+      system("tar", "-xC", @tmpdir.to_s, "-f", "test/test.git.tar")
     end
   end