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 3efd063d408fac83f685809aa3209156e1ca9c18..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
 
@@ -14,41 +14,22 @@ t-dch-commit -v $v -m testing
 t-git-debrebase analyse |tee ../anal.1
 cat ../anal.1
 
-echo >>debian/zorkmid '// debian'
-git add debian/zorkmid
-git commit -m 'DEBIAN add zorkmid'
-
-echo >>src.c '// upstream'
-git commit -a -m 'UPSTREAM edit src.c'
-
-for f in debian/zorkmid src.c; do
-       echo '// both!' >>$f
-       git add $f
-done
-git commit -m 'MIXED add boths'
+t-some-changes edits
 
 t-dch-commit -r sid
 
 git tag t.before
 
 t-git-debrebase
-
-git diff t.before -- ':.' ':!debian/patches'
-
-t-gdr-branch-structure laundered
+t-gdr-good laundered
 
 t-git-debrebase stitch --prose=wombat
-
-t-gdr-branch-structure stitched
+t-gdr-good stitched
 
 t-dgit push-source
+t-gdr-good pushed
 
-t-gdr-branch-structure 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