summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-18 00:15:49 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:06:58 +0100
commited807d37e761fdc5b5265f9a9963b671005ca959 (patch)
treec53f043987d10c07384d17e1dc6511f8632c0475
parent0b6c2ca9024f4060476084b128a1a0e6fe395d68 (diff)
git-debrebase: test suite: gdr nmu divergence: check that divergence check trips on nmus
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--tests/lib-gdr3
-rwxr-xr-xtests/tests/gdr-edits3
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr
index 0fc55e3..de365a2 100644
--- 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 cb2e471..70db713 100755
--- 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