test suite: Support run-all -p, DGIT_TESTS_PROGRESSIVE

[dgit.git] / tests / tests / push-newpackage

diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage
index 030507f15a6ca171298441c8c938ae5fb3a6a9ca..79355e3e4851014c665d697d0cfde8234b6c56f3 100755 (executable)
--- a/tests/tests/push-newpackage
+++ b/tests/tests/push-newpackage
@@ -2,27 +2,21 @@
 set -e
 . tests/lib
 
-t-archive-none pari-extra
-t-git-none
-t-worktree 3-1
-v=3-1
-cd $p
-git branch -m dgit/sid master
-git remote rm dgit
+t-prep-newpackage pari-extra 3-1
 
+cd $p
 t-refs-same-start
 t-ref-head
 
-LANG=C t-dgit push 2>&1 \
-       | tee /dev/stderr \
-       | grep 'package appears to be new in this suite' >/dev/null
+t-expect-push-fail 'package appears to be new in this suite' \
+t-dgit push
 
 t-dgit build
 
 git checkout bogus
 
 set +e
-(set -e; t-dgit push --new)
+(set -e; DGIT_TEST_DEBUG=' ' t-dgit push --new)
 rc=$?
 set -e
 if [ $rc = 0 ]; then fail "push succeeded when tree mismatch"; fi
@@ -33,4 +27,4 @@ t-dgit push --new
 
 t-pushed-good master
 
-echo ok.
+t-ok