Test suite: break out t-prep-newpackage (nfc)

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

diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage
index 3dfe0b58fadaa137c2142f98a82af85059fb8a84..5d23faa8312cfaeba869a5ea7d50a57da1aa8fb5 100755 (executable)
--- a/tests/tests/push-newpackage
+++ b/tests/tests/push-newpackage
@@ -2,21 +2,28 @@
 set -e
 . tests/lib
 
-t-archive-none pari-extra
-t-git-none
-t-worktree 3-1
-v=3-1
+t-prep-newpackage pari-extra 3-1
+
 cd $p
-git branch -m dgit/sid master
-git remote rm dgit
+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
 
-echo y
-
 t-dgit build
+
+git checkout bogus
+
+set +e
+(set -e; DGIT_TEST_DEBUG=' ' t-dgit push --new)
+rc=$?
+set -e
+if [ $rc = 0 ]; then fail "push succeeded when tree mismatch"; fi
+
+git checkout master
+
 t-dgit push --new
 
 t-pushed-good master