X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Ftagupl;h=80b92bee059d0f004fd3d56dfe05ded2cb0b325f;hb=2df5e989bcbb8d4d8510e4322f3db964e5b9ca9c;hp=7d716fe447481c5d7d1cb04f0ffd8534e3e22c93;hpb=d2a666050664abfba247cd1d18d585e6bba17b55;p=dgit.git

diff --git a/tests/tests/tagupl b/tests/tests/tagupl
index 7d716fe4..80b92bee 100755
--- a/tests/tests/tagupl
+++ b/tests/tests/tagupl
@@ -85,6 +85,12 @@ expect-email () {
 	grep ": failed, emailed" ../tagupl/overall.log
 }
 
+raw-mangled () {
+	git update-ref refs/tags/$tagname \
+		$(git hash-object -w -t tag ../tagobj-$ident)
+	t-tagupl-run-drs
+}
+
 tagname=test-dummy/1.2
 t-expect-fail E:'failed command: git fetch' \
 t-tagupl-run-drs
@@ -103,19 +109,51 @@ expect-email unkinfo 's/^\[dgit please-upload/$& Rejectme/' \
 expect-quit unkdistro 's/test-dummy/ubuntu/ if m/^\[dgit/' \
 	'not for this distro'
 
+expect-email notsplit 's/ split / no-split /' 'reject: missing "split"'
+
+expect-email upsnot1 's/ upstream=/ uxstream=/' \
+	'reject: upstream tag and not commitish'
+
+expect-email upsnot2 's/ upstream-tag=/ uxstream-tag=/' \
+	'reject: upstream tag and not commitish'
+
+expect-email bupstag1 's/ upstream-tag=/$&:/' \
+	"failed command: git check-ref-format"
+
+expect-email bupstag2 's/ upstream-tag=/$&x/' \
+	"Couldn't find remote ref refs/tags/xupstream"
+
+expect-email upsmism 's/ upstream=/$&3/' \
+	"but tag refers to"
+
 # we are going to trash $p because it will contain corrupted objects
 # which makes our end-of-test fsck fail
 cp -al ../$p ../$p.save
 cd ../$p
 
+git cat-file tag $tagname >../raw-base
+
+next-mangle sigfail
+perl -pe <../raw-base >../tagobj-$ident 's/ split / split ignoreme /'
+raw-mangled
+grep 'gpgv: BAD signature' ../sendmail.log
+
+next-mangle nosig
+perl -ne <../raw-base >../tagobj-$ident 'print unless m/^-----/..0'
+raw-mangled
+grep 'missing signature' ../sendmail.log
+
+git cat-file tag test-dummy/1.0-1 >../raw-base
+
 next-mangle badtagger
-git cat-file tag test-dummy/1.0-1 | perl -pe '
+perl -pe <../raw-base '
 	s/\+\d+$/xyz/ if m/^tagger /;
 	exit 0 if m/^$/;
 ' >../tagobj-$ident
 echo >>../tagobj-$ident
 cat ../basetag >>../tagobj-$ident
-git update-ref $tagname $(git hash-object -w -t tag ../tagobj-$ident)
+raw-mangled
+grep 'failed to fish tagger out of tag' ../tagupl/overall.log
 
 cd ..
 rm -rf $p