Process alias and non-alias configs separately

[pinch] / tests / reject-nonancestor.sh

diff --git a/tests/reject-nonancestor.sh b/tests/reject-nonancestor.sh
index b8e944ac52ced7713d562a08d2890f55e584e47d..44f2a82c1c32a66854d962b8e0fb6167e1bb7ab1 100755 (executable)
--- a/tests/reject-nonancestor.sh
+++ b/tests/reject-nonancestor.sh
@@ -1,23 +1,8 @@
 #!/bin/sh
 
 #!/bin/sh
 

-set -e
+. ./tests/lib/test-setup.sh

 
 

-repo_dir="`mktemp -d`"
-repo="$repo_dir/repo"
-git init "$repo"
-(
-  cd "$repo"
-  echo Contents > test-file
-  git add test-file
-  git commit -m 'Commit message'
-)
-
-conf="`mktemp`"
-cat > "$conf" <<EOF
-[foo]
-git_repo = file://$repo
-git_ref = master
-EOF
+foo_setup

 
 python3 ./pinch.py pin "$conf"
 
 
 python3 ./pinch.py pin "$conf"
 


@@ -28,11 +13,11 @@ python3 ./pinch.py pin "$conf"
   git commit --amend -m 'Amended commit message'
 )
 
   git commit --amend -m 'Amended commit message'
 )
 

+rm -rf "$cache_dir"/*
+

 if python3 ./pinch.py pin "$conf";then
   echo "FAIL: non-ancestor commit should be rejected"
   exit 1
 else
   echo PASS
 fi
 if python3 ./pinch.py pin "$conf";then
   echo "FAIL: non-ancestor commit should be rejected"
   exit 1
 else
   echo PASS
 fi

-
-rm -rf "$repo_dir" "$conf"