git-debrebase: test suite: do not dgit pull (sets a bad example)

[dgit.git] / tests / tests / gdr-import-dgit

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 5d4015709619aabd85b508bd7d72d8540ed7bc2f..a9a318779877eac49c1e10a785856309cf70907d 100755 (executable)
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -4,7 +4,7 @@ set -e
 
 t-dependencies git-buildpackage libfile-fnmatch-perl
 
-t-setup-import gbp2gdr
+t-setup-import gdr-convert-gbp
 
 cd $p
 
@@ -32,10 +32,17 @@ t-archive-process-incoming sid
 
 cd $p
 git checkout master
-t-dgit pull
+t-dgit fetch
+git merge --ff-only dgit/dgit/sid
+
+git diff --exit-code nmu
 
 git branch t.before
 
-: t-git-debrebase launder
+t-git-debrebase
+t-gdr-good laundered
+
+t-git-debrebase stitch
+t-gdr-good stitched
 
 t-ok