git-debrebase: Use debchange for new-upstream changelog entry

[dgit.git] / tests / tests / gdr-newupstream

diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream
index cfa00523d050f919d4dea36407a8391a44fc81fa..300d4345dde9f2fd06f2f4a9327f2417b41c6118 100755 (executable)
--- a/tests/tests/gdr-newupstream
+++ b/tests/tests/gdr-newupstream
@@ -1,27 +1,18 @@
 #!/bin/bash
 set -e
+autoimport=
 . tests/lib
 
 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'
 
@@ -35,7 +26,35 @@ t-git-debrebase new-upstream $v
 
 git tag v2.1 upstream
 
-t-git-debrebase new-upstream $v
+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'
 
@@ -44,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 '