X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-newupstream;h=30396691912872c8fd03cf91c9a4c942c5981379;hb=d98b7653e23426cdfe91f6892c2a2f1c21481cd0;hp=39ed24b86bf5e5dcd817e70e7cba3021afb98b7b;hpb=422f18bf5da933f789e8b2b818d558a66f4d5dcf;p=dgit.git

diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream
index 39ed24b8..30396691 100755
--- a/tests/tests/gdr-newupstream
+++ b/tests/tests/gdr-newupstream
@@ -5,24 +5,14 @@ autoimport=
 
 t-dependencies NO-DGIT GDR
 
+t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp-noarchive
 
 cd $p
 
 : 'upstream hat'
 
-new-upstream () {
-	uv=$1
-	t-git-next-date
-	git checkout make-upstream
-	git reset --hard upstream
-	t-make-new-upstream-tarball $uv
-	git push . make-upstream:upstream
-	git checkout master
-	t-git-next-date
-}
-
-new-upstream 2.1
+t-gdr-prep-new-upstream 2.1
 
 : 'maintainer hat'
 
@@ -36,8 +26,35 @@ t-git-debrebase new-upstream $v
 
 git tag v2.1 upstream
 
+git branch before-new-upstream
+
+clog-check-1 () {
+	before=$1
+	date=$(git log --format=%aD -n1 debian/changelog)
+	date=$(date -R -d "$date")
+	git show $before:debian/changelog >../clog.before
+	m="  * Update to new upstream version ${v%-*}."
+	e="dgit test git user <dgit-test@debian.example.net>  $date"
+}
+clog-check-2 () {
+	diff -u ../clog.expected debian/changelog
+}
+
+: ----- ordinary new upstream test -----
+
 t-git-debrebase new-upstream ${v%-*}
 
+clog-check-1 before-new-upstream
+cat - <<END ../clog.before >../clog.expected
+example ($v) UNRELEASED; urgency=medium
+
+$m
+
+ -- $e
+
+END
+clog-check-2
+
 t-gdr-good laundered
 git reflog | egrep 'debrebase new-upstream.*checkout'
 
@@ -46,9 +63,9 @@ t-gdr-good stitched
 
 git branch ordinary
 
-: 'with --anchor'
+: ----- 'with --anchor' -----
 
-git reset --hard startpoint
+git checkout -b with-anchor startpoint
 
 t-git-debrebase analyse >../anal.anch
 anchor=$(perl <../anal.anch -ne '
@@ -68,4 +85,25 @@ t-gdr-good stitched
 
 git diff --quiet ordinary
 
+: ----- with pre-existing changes -----
+
+git checkout -b with-preexisting before-new-upstream
+
+t-dch-commit drivel-in-changelog
+git branch before-new-upstream-with-changes
+
+t-git-next-date
+
+t-git-debrebase new-upstream ${v%-*}
+
+clog-check-1 before-new-upstream-with-changes
+perl -pe <../clog.before >../clog.expected '
+	BEGIN { ($m,$e,@ARGV) = @ARGV; }
+	next unless 1..m/^ --/;
+	s/\([^()]+\)/('$v')/ if m/^example /;
+	$_ .= "$m\n" if m/^  \* drivel-in-changelog/;
+	$_ = " -- $e\n" if m/^ -- /;
+' "$m" "$e"
+clog-check-2
+
 t-ok