X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-edits;h=d82c2383f1ab639a022bbb28deb7cfc7eb9c989f;hb=81b54cfc353832f717ad514b7c6a14e55a380b7d;hp=2d596fc6a5cf2c637be6e07ab4429769abc85f78;hpb=61d6570d98dcc929a2f12c2ad6396dd03321cd78;p=dgit.git

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 2d596fc6..d82c2383 100755
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -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
 
@@ -21,19 +21,15 @@ t-dch-commit -r sid
 git tag t.before
 
 t-git-debrebase
-t-gdr-same-as-before
-t-gdr-branch-structure laundered
+t-gdr-good laundered
 
 t-git-debrebase stitch --prose=wombat
-t-gdr-same-as-before
-t-gdr-branch-structure stitched
+t-gdr-good stitched
 
 t-dgit push-source
-t-gdr-same-as-before
-t-gdr-branch-structure pushed
+t-gdr-good pushed
 
 : todo 'more tests: convert dgit import new upstream version'
-: todo 'more tests: convert dgit import same upstream version'
 : todo 'more tests: other maint updated, we must fetch'
 : todo 'more tests: other maint updated, alert divergence'
 : todo 'more tests: nmu divergence'