diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-17 19:41:36 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:04:33 +0100 |
commit | 3991eff63504d351b858d3a84392dbb03245946c (patch) | |
tree | 5941a2cc48e37015af89c82625b863db8e3281ee | |
parent | a256823c46da760688493a32ec49e5c2b93cd17a (diff) |
git-debrebase: test suite: gdr-import-dgit: test a new upstream non-gdr upload too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | tests/tests/gdr-edits | 1 | ||||
-rwxr-xr-x | tests/tests/gdr-import-dgit | 21 |
2 files changed, 20 insertions, 2 deletions
diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits index c3ccff1..83bd801 100755 --- a/tests/tests/gdr-edits +++ b/tests/tests/gdr-edits @@ -29,7 +29,6 @@ t-gdr-good stitched t-dgit push-source t-gdr-good pushed -: todo 'more tests: convert dgit import new upstream version' : todo 'more tests: other maint updated, we must fetch' : todo 'more tests: other maint updated, alert divergence' : todo 'more tests: nmu divergence' diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit index c1e9ba9..17ab2bc 100755 --- a/tests/tests/gdr-import-dgit +++ b/tests/tests/gdr-import-dgit @@ -58,7 +58,6 @@ nmu-fold () { git branch unlaundered.$nmubranch t-git-debrebase - t-gdr-good laundered t-git-debrebase stitch @@ -72,4 +71,24 @@ t-dch-commit -v $v -m "incorporate nmu" t-dch-commit -r sid t-dgit -wgf push-source +: 'now test a new upstream' + +t-make-new-upstream-tarball 2.1 + +git checkout master +v=2.1-0+nmu1 +nmu-upload-1 nmu2 + +gbp import-orig --upstream-version=2.1 --debian-branch=nmu2 ../$ust +t-dch-commit -v $v -m "new upstream $v" +gbp pq import + +#t-dgit -wgf build-source + +nmu-upload-2 + +: 'done the nmu, back to the maintainer' + +nmu-fold + t-ok |