Test suite: Move t-reporefs into lib

diff --git a/tests/lib b/tests/lib
index cf8b72569dfdabc2368c0f49f4762cc4dede8128..5c8293f9b200d1f127c8811b7f875fe6ca5024f0 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -52,6 +52,14 @@ t-expect-fail () {
        egrep "$mpat" $tmp/t.output ||false
 }
 
+t-reporefs () {
+       (set -e
+       if test -d $tmp/git/$p.git; then
+               cd $tmp/git/$p.git
+               git show-ref |sort
+       fi)
+}
+
 t-untar () {
        local tarfile=$1.tar
        local edittree=$1.edit

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 5f6d04a498792e43ef1c318693f31498ae9dfde7..5b450bf85cc32efc9acff695643d3cefbfce977b 100755 (executable)
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -10,17 +10,9 @@ t-worktree drs
 
 cd $p
 
-reporefs () {
-       (set -e
-       if test -d $tmp/git/$p.git; then
-               cd $tmp/git/$p.git
-               git show-ref
-       fi)
-}
-
 mustfail () {
        local wantmsg="$1"; shift
-       reporefs >$tmp/show-refs.pre-push
+       t-reporefs >$tmp/show-refs.pre-push
        set +e
        git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
        ps="${PIPESTATUS[*]}"
@@ -33,14 +25,14 @@ mustfail () {
        if ! fgrep "$wantmsg" $tmp/mustfail.txt >/dev/null; then
                fail "error message not found"
        fi
-       reporefs >$tmp/show-refs.post-push
+       t-reporefs >$tmp/show-refs.post-push
        diff $tmp/show-refs.{pre,post}-push
 }
 
 mustsucceed () {
-       reporefs >$tmp/show-refs.pre-push
+       t-reporefs >$tmp/show-refs.pre-push
        git push origin "$@"
-       reporefs >$tmp/show-refs.post-push
+       t-reporefs >$tmp/show-refs.post-push
        if diff $tmp/show-refs.{pre,post}-push >$tmp/show-refs.diff; then
                fail "no refs updated"
        fi