LANG, LC_*: Consistently set required LC_* env vars

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

diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage
index 2d016572316059d588c3ed4877e2d50e56b88c2b..2bfa5d5a30871cba470689348d2e9d439996d8cb 100755 (executable)
--- a/tests/tests/push-newpackage
+++ b/tests/tests/push-newpackage
@@ -2,23 +2,30 @@
 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 \
+LC_MESSAGES=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
+t-pushed-good master
 
 echo ok.