From 675394bcf1ec6fbcd0e4018e136dc65206952b09 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Karl=20Hasselstr=C3=B6m?= Date: Fri, 24 Aug 2007 11:49:24 +0200 Subject: [PATCH] Don't use test_expect_failure when more than one thing could fail MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It's much better to use ! for the part that you actually expect to fail; that way, the test will still scream if something _else_ goes wrong. Signed-off-by: Karl Hasselström --- t/t2101-pull-policy-pull.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t2101-pull-policy-pull.sh b/t/t2101-pull-policy-pull.sh index 793491c8..14d5adb7 100755 --- a/t/t2101-pull-policy-pull.sh +++ b/t/t2101-pull-policy-pull.sh @@ -39,11 +39,11 @@ test_expect_success \ # as rewinding, and thus heads/origin is not moved, but the stack # is still correctly rebased -test_expect_failure \ +test_expect_success \ 'Rewind/rewrite upstream commit and pull it from clone, without --merged' \ ' (cd upstream && echo b >> file2 && stg refresh) && - (cd clone && stg pull) + (cd clone && ! stg pull) ' test_expect_success \ -- 2.11.4.GIT