diff options
Diffstat (limited to 'tests/tests/gdr-newupstream')
-rwxr-xr-x | tests/tests/gdr-newupstream | 65 |
1 files changed, 51 insertions, 14 deletions
diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream index ada5516..3039669 100755 --- a/tests/tests/gdr-newupstream +++ b/tests/tests/gdr-newupstream @@ -12,18 +12,7 @@ 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' @@ -37,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' @@ -47,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 ' @@ -69,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 |