X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/1b48018c3d40a9f70ac98aa3d3112fc5d8cb2201..ba23f9978a3e5f47051ad611a71996b26de4c02e:/tests/lib/test-setup.sh

diff --git a/tests/lib/test-setup.sh b/tests/lib/test-setup.sh
index 35a4e73..f3eb661 100644
--- a/tests/lib/test-setup.sh
+++ b/tests/lib/test-setup.sh
@@ -1,5 +1,7 @@
 set -e
 
+export BACKOFF_MAX_TIME=0
+
 export GIT_AUTHOR_NAME=automation
 export GIT_COMMITTER_NAME=automation
 export GIT_AUTHOR_EMAIL=auto@mati.on
@@ -8,11 +10,16 @@ export GIT_COMMITTER_EMAIL=auto@mati.on
 cache_dir=$(mktemp -d)
 export XDG_CACHE_HOME=$cache_dir
 
+nix_store=$(mktemp -d)
+nix_state=$(mktemp -d)
+export NIX_STORE_DIR=$nix_store
+export NIX_STATE_DIR=$nix_state
+
 foo_setup() {
 
   repo_dir="`mktemp -d`"
   repo="$repo_dir/repo"
-  git init "$repo"
+  git -c init.defaultBranch=master init "$repo"
   (
     cd "$repo"
     echo Contents > test-file
@@ -23,6 +30,7 @@ foo_setup() {
   conf="`mktemp`"
   cat > "$conf" <<EOF
 [foo]
+type = git
 git_repo = file://$repo
 git_ref = master
 EOF
@@ -33,6 +41,8 @@ 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 [ "$nix_store" ];then rm -rf "$nix_store"; fi
+  if [ "$nix_state" ];then rm -rf "$nix_state"; fi
 }
 
 trap test_cleanup EXIT INT TERM