From 91c2126e5ab7bea38708933c9281c12c814bb200 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 10 Aug 2018 07:45:22 +0100 Subject: test suite: lib-gdr: Break out t-gdr-prep-new-upstream This does not include `git tag' for the upstream, because gdr-newupstream wants to test the case where the tag is missing. Signed-off-by: Ian Jackson --- tests/tests/gdr-newupstream | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'tests/tests/gdr-newupstream') diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream index ada5516..0724459 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' -- cgit v1.2.3 From 27ecf86e831ab5a4908a2d0541e0e987e39da48e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Aug 2018 16:06:03 +0100 Subject: test suite: gdr-new-upstream: Check changelog is exactly right Signed-off-by: Ian Jackson --- tests/tests/gdr-newupstream | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tests/tests/gdr-newupstream') diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream index 0724459..d72971a 100755 --- a/tests/tests/gdr-newupstream +++ b/tests/tests/gdr-newupstream @@ -26,8 +26,22 @@ t-git-debrebase new-upstream $v git tag v2.1 upstream +git branch before-new-upstream + t-git-debrebase new-upstream ${v%-*} +date=$(git log --format=%aD -n1 debian/changelog) +cat >../clog.expected < $date + +END +git show before-new-upstream:debian/changelog >>../clog.expected +diff -u ../clog.expected debian/changelog + t-gdr-good laundered git reflog | egrep 'debrebase new-upstream.*checkout' -- cgit v1.2.3 From 1162e091e51107a84f3da3fa2a2cbc72f9c0805a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Aug 2018 16:16:40 +0100 Subject: test suite: gdr-newupstream: Add more dividers NFC Signed-off-by: Ian Jackson --- tests/tests/gdr-newupstream | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/tests/gdr-newupstream') diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream index d72971a..59acca8 100755 --- a/tests/tests/gdr-newupstream +++ b/tests/tests/gdr-newupstream @@ -28,6 +28,8 @@ git tag v2.1 upstream git branch before-new-upstream +: ----- ordinary new upstream test ----- + t-git-debrebase new-upstream ${v%-*} date=$(git log --format=%aD -n1 debian/changelog) @@ -50,7 +52,7 @@ t-gdr-good stitched git branch ordinary -: 'with --anchor' +: ----- 'with --anchor' ----- git reset --hard startpoint -- cgit v1.2.3 From 94de5d70fa00eddd070413f4ed6c6670744b319b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Aug 2018 16:20:00 +0100 Subject: test suite: gdr-new-upstream: Use new branch rather than reset This makes it slightly easier to see what's going on, and to extend the test. No overall functional change. Signed-off-by: Ian Jackson --- tests/tests/gdr-newupstream | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/tests/gdr-newupstream') diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream index 59acca8..ed80554 100755 --- a/tests/tests/gdr-newupstream +++ b/tests/tests/gdr-newupstream @@ -54,7 +54,7 @@ git branch ordinary : ----- 'with --anchor' ----- -git reset --hard startpoint +git checkout -b with-anchor startpoint t-git-debrebase analyse >../anal.anch anchor=$(perl <../anal.anch -ne ' -- cgit v1.2.3 From 35c89cd28f7089073a4f9aafc1b60d8bdc3aca8a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Aug 2018 16:39:24 +0100 Subject: test suite: gdr-new-upstream: Break out clog-check-[12] NFC Signed-off-by: Ian Jackson --- tests/tests/gdr-newupstream | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'tests/tests/gdr-newupstream') diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream index ed80554..b45a0bf 100755 --- a/tests/tests/gdr-newupstream +++ b/tests/tests/gdr-newupstream @@ -28,21 +28,31 @@ git tag v2.1 upstream git branch before-new-upstream +clog-check-1 () { + before=$1 + date=$(git log --format=%aD -n1 debian/changelog) + git show $before:debian/changelog >../clog.before + m=" * Update to new upstream version ${v%-*}." + e="dgit test git user $date" +} +clog-check-2 () { + diff -u ../clog.expected debian/changelog +} + : ----- ordinary new upstream test ----- t-git-debrebase new-upstream ${v%-*} -date=$(git log --format=%aD -n1 debian/changelog) -cat >../clog.expected <../clog.expected example ($v) UNRELEASED; urgency=medium - * Update to new upstream version ${v%-*}. +$m - -- dgit test git user $date + -- $e END -git show before-new-upstream:debian/changelog >>../clog.expected -diff -u ../clog.expected debian/changelog +clog-check-2 t-gdr-good laundered git reflog | egrep 'debrebase new-upstream.*checkout' -- cgit v1.2.3 From b6c697655db17a9080849ab40dba7b5a737ffb81 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Aug 2018 17:39:32 +0100 Subject: git-debrebase: Use debchange for new-upstream changelog entry Closes: #905888. Signed-off-by: Ian Jackson --- tests/tests/gdr-newupstream | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/tests/gdr-newupstream') diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream index b45a0bf..300d434 100755 --- a/tests/tests/gdr-newupstream +++ b/tests/tests/gdr-newupstream @@ -31,6 +31,7 @@ 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 $date" -- cgit v1.2.3 From 075e5ee39813f272713793fd8b778c81697e24e2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Aug 2018 17:40:04 +0100 Subject: test suite: gdr-new-upstream: Test updating existing clog entry This is the test case for #905888. Signed-off-by: Ian Jackson --- tests/tests/gdr-newupstream | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'tests/tests/gdr-newupstream') diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream index 300d434..3039669 100755 --- a/tests/tests/gdr-newupstream +++ b/tests/tests/gdr-newupstream @@ -85,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 -- cgit v1.2.3