diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 16:39:24 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-26 01:20:44 +0100 |
| commit | 35c89cd28f7089073a4f9aafc1b60d8bdc3aca8a (patch) | |
| tree | 16e901ea099712d0fc027f8cc4074ff0cbe492ad /tests | |
| parent | 94de5d70fa00eddd070413f4ed6c6670744b319b (diff) | |
test suite: gdr-new-upstream: Break out clog-check-[12]
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/tests/gdr-newupstream | 22 |
1 files changed, 16 insertions, 6 deletions
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 <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%-*} -date=$(git log --format=%aD -n1 debian/changelog) -cat >../clog.expected <<END +clog-check-1 before-new-upstream +cat - <<END ../clog.before >../clog.expected example ($v) UNRELEASED; urgency=medium - * Update to new upstream version ${v%-*}. +$m - -- dgit test git user <dgit-test@debian.example.net> $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' |