test suite: gbp2gdr: seems to work now

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 8088e9830ae7ab3d5036a91a776002bebcbd3423..5c2b969f9f85f5f6b53d54af475abfdca06406df 100755 (executable)
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -7,7 +7,6 @@ t-dependencies git-buildpackage libfile-fnmatch-perl
 
 t-tstunt-parsechangelog
 
 
 t-tstunt-parsechangelog
 

-

 not-gdr-processable () {
        t-expect-fail F:'Cannot cope with this commit' \
        t-git-debrebase
 not-gdr-processable () {
        t-expect-fail F:'Cannot cope with this commit' \
        t-git-debrebase


@@ -55,9 +54,33 @@ gbp import-orig --upstream-version=2.0 ../$ust
 
 not-gdr-processable
 
 
 not-gdr-processable
 

+dch -v 2.0-1 -m 'new upstream (did gbp import-orig)'
+dch -r sid
+git commit -m changelog debian/changelog
+
+t-archive-none $p
+t-git-none
+t-dgit -wgf --gbp push-source --new
+
+t-salsa-add-remote
+git push --set-upstream origin master
+
+# OK now this looks like something more normal.
+# We have:
+#  maintainer (gbp) view                dgit view
+#    master
+#    debian/2.0-1                          archive/debian/2.0-1
+#    remotes/origin/master                 remotes/dgit/dgit/sid
+

 t-git-debrebase -fupstream-has-debian gbp2debrebase
 
 t-git-debrebase -fupstream-has-debian gbp2debrebase
 

-: xxx
+dch -v 2.0-2 -m 'switch to git-debrebase, no other changes'
+dch -r sid
+git commit -m changelog debian/changelog
+
+t-dgit -wgf push-source --new --overwrite
+git push
+

 t-ok
 exit 0
 
 t-ok
 exit 0