fallback git-cache 1.4.2 -> 1.4.3

[pinch] / tests / lib / test-setup.sh

diff --git a/tests/lib/test-setup.sh b/tests/lib/test-setup.sh
index 66d13eb8b776c5886873f0645118163306737735..e4260f4646f85a73fdca62b1c81a5e6d7579ed93 100644 (file)
--- a/tests/lib/test-setup.sh
+++ b/tests/lib/test-setup.sh
@@ -1,12 +1,16 @@
 set -e
 
 set -e
 

+export BACKOFF_MAX_TIME=0
+

 export GIT_AUTHOR_NAME=automation
 export GIT_COMMITTER_NAME=automation
 export GIT_AUTHOR_EMAIL=auto@mati.on
 export GIT_COMMITTER_EMAIL=auto@mati.on
 
 cache_dir=$(mktemp -d)
 export GIT_AUTHOR_NAME=automation
 export GIT_COMMITTER_NAME=automation
 export GIT_AUTHOR_EMAIL=auto@mati.on
 export GIT_COMMITTER_EMAIL=auto@mati.on
 
 cache_dir=$(mktemp -d)

+data_dir=$(mktemp -d)

 export XDG_CACHE_HOME=$cache_dir
 export XDG_CACHE_HOME=$cache_dir

+export XDG_DATA_HOME=$data_dir

 
 nix_store=$(mktemp -d)
 nix_state=$(mktemp -d)
 
 nix_store=$(mktemp -d)
 nix_state=$(mktemp -d)


@@ -17,7 +21,7 @@ foo_setup() {
 
   repo_dir="`mktemp -d`"
   repo="$repo_dir/repo"
 
   repo_dir="`mktemp -d`"
   repo="$repo_dir/repo"

-  git init "$repo"
+  git -c init.defaultBranch=master init "$repo"

   (
     cd "$repo"
     echo Contents > test-file
   (
     cd "$repo"
     echo Contents > test-file


@@ -28,6 +32,7 @@ foo_setup() {
   conf="`mktemp`"
   cat > "$conf" <<EOF
 [foo]
   conf="`mktemp`"
   cat > "$conf" <<EOF
 [foo]

+type = git

 git_repo = file://$repo
 git_ref = master
 EOF
 git_repo = file://$repo
 git_ref = master
 EOF


@@ -38,6 +43,7 @@ test_cleanup() {
   if [ "$repo_dir"  ];then rm -rf "$repo_dir";  fi
   if [ "$conf"      ];then rm     "$conf";      fi
   if [ "$cache_dir" ];then rm -rf "$cache_dir"; fi
   if [ "$repo_dir"  ];then rm -rf "$repo_dir";  fi
   if [ "$conf"      ];then rm     "$conf";      fi
   if [ "$cache_dir" ];then rm -rf "$cache_dir"; fi

+  if [ "$data_dir"  ];then rm -rf "$data_dir";  fi

   if [ "$nix_store" ];then rm -rf "$nix_store"; fi
   if [ "$nix_state" ];then rm -rf "$nix_state"; fi
 }
   if [ "$nix_store" ];then rm -rf "$nix_store"; fi
   if [ "$nix_state" ];then rm -rf "$nix_state"; fi
 }