diff options
| -rw-r--r-- | NOTES.git-debrebase | 2 | ||||
| -rw-r--r-- | debian/tests/control | 2 | ||||
| -rwxr-xr-x | tests/tests/gdr-newupstream-v0 | 36 |
3 files changed, 37 insertions, 3 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index cafab1a..155d0da 100644 --- a/NOTES.git-debrebase +++ b/NOTES.git-debrebase @@ -1,6 +1,4 @@ TODO - test case for new-upstream-v0 - --anchor option to specify commit(s) to treat as as anchor(s) reference docs diff --git a/debian/tests/control b/debian/tests/control index c758c31..ff8ae85 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -16,7 +16,7 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin Restrictions: x-dgit-intree-only x-dgit-git-only -Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-viagit +Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-newupstream-v0 gdr-viagit Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-buildpackage, libfile-fnmatch-perl, faketime diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0 new file mode 100755 index 0000000..4480fd5 --- /dev/null +++ b/tests/tests/gdr-newupstream-v0 @@ -0,0 +1,36 @@ +#!/bin/bash +set -e +. tests/lib + +t-dependencies git-buildpackage libfile-fnmatch-perl faketime + +t-setup-import gdr-convert-gbp + +cd $p + +: 'upstream hat' + +new-upstream () { + uv=$1 + git checkout make-upstream + git reset --hard upstream + t-make-new-upstream-tarball $uv + git push . make-upstream:upstream + git checkout master +} + +new-upstream 2.1 + +: 'maintainer hat' + +git checkout master + +v=2.1-1 + +t-git-debrebase new-upstream-v0 $v upstream +t-gdr-good laundered + +t-git-debrebase stitch +t-gdr-good stitched + +t-ok |