diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-01 20:23:54 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-16 14:38:47 -0700 |
| commit | 794165cb17c1f19c21ac36c2c362f0e4069de792 (patch) | |
| tree | 3d25b0d59a32974989edc792bd22bb5447c660e1 | |
| parent | be8c48d4c4e42a7fe879241ca4e52325dd4f96f0 (diff) | |
| download | git-794165cb17c1f19c21ac36c2c362f0e4069de792.tar.gz | |
t9814: simplify convoluted check that command correctly errors out
This test uses a convoluted method to verify that "p4 help" errors
out when asked for help about an unknown command. In doing so, it
intentionally breaks the &&-chain. Simplify by employing the typical
"! command" idiom and a normal &&-chain instead.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t9814-git-p4-rename.sh | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh index e7e0268e98..60baa06e27 100755 --- a/t/t9814-git-p4-rename.sh +++ b/t/t9814-git-p4-rename.sh @@ -9,23 +9,11 @@ test_expect_success 'start p4d' ' ' # We rely on this behavior to detect for p4 move availability. -test_expect_success 'p4 help unknown returns 1' ' +test_expect_success '"p4 help unknown" errors out' ' ( cd "$cli" && - ( - p4 help client >errs 2>&1 - echo $? >retval - ) - echo 0 >expected && - test_cmp expected retval && - rm retval && - ( - p4 help nosuchcommand >errs 2>&1 - echo $? >retval - ) - echo 1 >expected && - test_cmp expected retval && - rm retval + p4 help client && + ! p4 help nosuchcommand ) ' |