From ed807d37e761fdc5b5265f9a9963b671005ca959 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 18 Feb 2018 00:15:49 +0000 Subject: git-debrebase: test suite: gdr nmu divergence: check that divergence check trips on nmus Signed-off-by: Ian Jackson --- tests/lib-gdr | 3 +++ tests/tests/gdr-edits | 3 --- 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 -- cgit v1.2.3