summaryrefslogtreecommitdiff
path: root/tests/tests/drs-push-rejects
diff options
context:
space:
mode:
Diffstat (limited to 'tests/tests/drs-push-rejects')
-rwxr-xr-xtests/tests/drs-push-rejects79
1 files changed, 43 insertions, 36 deletions
diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index f6f8882..afaed4c 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -5,42 +5,24 @@ set -e
t-drs
t-git-none
-p=pari-extra
+t-select-package pari-extra
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)
-}
+git remote set-url origin \
+ "ext::$troot/drs-git-ext %S /pari-extra.git"
mustfail () {
- local wantmsg="$1"; shift
- reporefs >$tmp/show-refs.pre-push
- set +e
- git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
- ps="${PIPESTATUS[*]}"
- set -e
- case $ps in
- "0 0") fail "push unexpectedly succeeded (instead of: $wantmsg)" ;;
- *" 0") ;;
- *) fail "tee failed" ;;
- esac
- if ! fgrep "$wantmsg" $tmp/mustfail.txt >/dev/null; then
- fail "error message not found"
- fi
- reporefs >$tmp/show-refs.post-push
- diff $tmp/show-refs.{pre,post}-push
+ local mpat="$1"; shift
+ t-expect-push-fail "$mpat" \
+ git push origin "$@"
}
mustsucceed () {
- reporefs >$tmp/show-refs.pre-push
+ t-reporefs pre-push
git push origin "$@"
- reporefs >$tmp/show-refs.post-push
+ t-reporefs post-push
if diff $tmp/show-refs.{pre,post}-push >$tmp/show-refs.diff; then
fail "no refs updated"
fi
@@ -48,16 +30,20 @@ mustsucceed () {
prep () {
local suite=$1
- local csuite=$2
+ csuite=$2
cp $tmp/masters/* $tmp/.
tag_signer='-u Senatus'
tag_message="$p release $version for $suite ($csuite) [dgit]"
- tag_name=debian/$version
+ re-prep
+}
+re-prep () {
+ tag_name=$tagpfx/$version
push_spec1="HEAD:refs/dgit/$csuite"
push_spec2="refs/tags/$tag_name"
push_spec="$push_spec1 $push_spec2"
}
mktag () {
+ t-git-next-date
git tag -f $tag_signer -m "$tag_message" $tag_name "$@"
}
@@ -86,7 +72,7 @@ for h in object type tag; do
cat badtag.asc >>badtag
set +e
- LC_ALL=C git hash-object -w -t tag badtag >badtag.hash 2>badtag.err
+ LC_MESSAGES=C git hash-object -w -t tag badtag >badtag.hash 2>badtag.err
rc=$?
set -e
@@ -101,6 +87,8 @@ for h in object type tag; do
git update-ref refs/tags/$tag_name $badtag
mustfail 'multiple headers '$h' in signed tag object' $push_spec
+
+ t-expect-fsck-fail $badtag
done
done
@@ -119,10 +107,11 @@ mustfail 'sid != sponge' HEAD:refs/dgit/sponge $push_spec2
prep unstable sid
mktag
mustfail 'push is missing tag ref update' $push_spec1
-mustfail 'push is missing head ref update' $push_spec2
+mustfail 'push is missing head ref update' +$push_spec2
mustfail 'pushing unexpected ref' $push_spec HEAD:refs/wombat
mustfail 'pushing multiple heads' $push_spec HEAD:refs/dgit/wombat
-mustfail 'pushing multiple tags' $push_spec HEAD:refs/tags/debian/wombat
+mustfail E:'pushing multiple tags|pushing too many similar tags' \
+ $push_spec HEAD:refs/tags/$tagpfx/wombat
prep unstable sid
mktag
@@ -149,18 +138,36 @@ mktag HEAD~:
mustfail 'tag refers to wrong kind of object' $push_spec
prep unstable sid
-tag_name=debian/wombat
+tag_name=$tagpfx/wombat
mktag
-#git update-ref debian/$version debian/wombat
+#git update-ref $tagpfx/$version $tagpfx/wombat
mustfail 'tag name in tag is wrong' \
- refs/tags/debian/wombat:refs/tags/debian/$version $push_spec1
+ refs/tags/$tagpfx/wombat:refs/tags/$tagpfx/$version $push_spec1
+t-make-badcommit
+git checkout -b broken $badcommit
+prep unstable sid
+mktag
+mustfail "corrupted object $badcommit" $push_spec
+
+git checkout dgit/sid
prep unstable sid
mktag
mustsucceed $push_spec # succeeds
mktag
-mustfail 'not replacing previously-pushed version' $push_spec
+mustfail 'push is missing head ref update' $push_spec1 +$push_spec2
+
+git commit --allow-empty -m 'Dummy update'
+mktag
+mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2
+
+t-newtag
+re-prep
+mktag
+mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2
+
+git reset --hard HEAD~
prep_dm_mangle () {
prep unstable sid
@@ -196,4 +203,4 @@ mustfail "not in permissions list although in keyring" $push_spec
prep_dm_mangle ''
mustsucceed $push_spec # succeeds
-echo ok.
+t-ok