git-debrebase: test suite: gdr-diverge-nmu-dgit: new test

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

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index d4e2a85a5bcc64644959b6bcb94eb60dab34ceea..cb2e4714aaa1cdc1521cb02eb691d473fdb6dcc9 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -2,9 +2,9 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl
+t-dependencies git-buildpackage libfile-fnmatch-perl faketime
 
-t-setup-import gbp2gdr
+t-setup-import gdr-convert-gbp
 
 cd $p
 
@@ -29,10 +29,7 @@ t-gdr-good stitched
 t-dgit push-source
 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'
 
 t-ok