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>

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index c3ccff1273c897588272c6f645ac7b958948adc9..83bd8016849cc381d00a458fceb7ad80abe98873 100755 (executable)
--- 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
 
 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'
 : 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 c1e9ba9bd814dd01d60f4de8169d8a23db67ebf7..17ab2bc6347d7312eb4390c36f1c1156770edebf 100755 (executable)
--- 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
        git branch unlaundered.$nmubranch
 
        t-git-debrebase

-

        t-gdr-good laundered
 
        t-git-debrebase stitch
        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
 
 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
 t-ok