git-debrebase: test suite: gdr nmu divergence: check that divergence check trips...

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index c91cdcc28cf14fc08df6da278bebc07694d020ed..f11d56350473a23a51a2e05ecf6cad0b48a1fa20 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -208,6 +208,9 @@ t-nmu-causes-ff-fail () {
 
        t-expect-fail E:'Not.*fast-forward' \
        git merge --ff-only dgit/dgit/sid
+
+       t-expect-fail E:'-fdiverged.*refs/remotes/dgit/dgit/sid' \
+       t-git-debrebase
 }
 
 t-nmu-reconciled-good () {

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index cb2e4714aaa1cdc1521cb02eb691d473fdb6dcc9..70db713d6abf78792618c61feda0efefc3db463a 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -29,7 +29,4 @@ t-gdr-good stitched
 t-dgit push-source
 t-gdr-good pushed
 
-: todo 'more tests: other maint updated, we must fetch'
-: todo 'more tests: other maint updated, alert divergence'
-
 t-ok