development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

t3200: test for specific errors

Browse source 
In the "--set-upstream-to" and "--unset-upstream" tests, specific error
conditions are being tested. However, there is no way of ensuring that a
test case is failing because of some specific error.

Check stderr of failing commands to ensure that they are failing in the
expected way.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Denton Liu 2020-06-15 07:53:19 -04:00 committed by Junio C Hamano
parent 6d504d5b0f
commit 6b7093064a
1 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
t/t3200-branch.sh
View file

@ -835,32 +835,42 @@ test_expect_success 'branch from tag w/--track causes failure' '
' '
test_expect_success '--set-upstream-to fails on multiple branches' ' test_expect_success '--set-upstream-to fails on multiple branches' '
test_must_fail git branch --set-upstream-to master a b c echo "fatal: too many arguments to set new upstream" >expect &&
test_must_fail git branch --set-upstream-to master a b c 2>err &&
test_i18ncmp expect err
' '
test_expect_success '--set-upstream-to fails on detached HEAD' ' test_expect_success '--set-upstream-to fails on detached HEAD' '
git checkout HEAD^{} && git checkout HEAD^{} &&
test_must_fail git branch --set-upstream-to master && test_when_finished git checkout - &&
git checkout - echo "fatal: could not set upstream of HEAD to master when it does not point to any branch." >expect &&
test_must_fail git branch --set-upstream-to master 2>err &&
test_i18ncmp expect err
' '
test_expect_success '--set-upstream-to fails on a missing dst branch' ' test_expect_success '--set-upstream-to fails on a missing dst branch' '
test_must_fail git branch --set-upstream-to master does-not-exist echo "fatal: branch '"'"'does-not-exist'"'"' does not exist" >expect &&
test_must_fail git branch --set-upstream-to master does-not-exist 2>err &&
test_i18ncmp expect err
' '
test_expect_success '--set-upstream-to fails on a missing src branch' ' test_expect_success '--set-upstream-to fails on a missing src branch' '
test_must_fail git branch --set-upstream-to does-not-exist master test_must_fail git branch --set-upstream-to does-not-exist master 2>err &&
test_i18ngrep "the requested upstream branch '"'"'does-not-exist'"'"' does not exist" err
' '
test_expect_success '--set-upstream-to fails on a non-ref' ' test_expect_success '--set-upstream-to fails on a non-ref' '
test_must_fail git branch --set-upstream-to HEAD^{} echo "fatal: Cannot setup tracking information; starting point '"'"'HEAD^{}'"'"' is not a branch." >expect &&
test_must_fail git branch --set-upstream-to HEAD^{} 2>err &&
test_i18ncmp expect err
' '
test_expect_success '--set-upstream-to fails on locked config' ' test_expect_success '--set-upstream-to fails on locked config' '
test_when_finished "rm -f .git/config.lock" && test_when_finished "rm -f .git/config.lock" &&
>.git/config.lock && >.git/config.lock &&
git branch locked && git branch locked &&
test_must_fail git branch --set-upstream-to locked test_must_fail git branch --set-upstream-to locked 2>err &&
test_i18ngrep "could not lock config file .git/config: File exists" err
' '
test_expect_success 'use --set-upstream-to modify HEAD' ' test_expect_success 'use --set-upstream-to modify HEAD' '
@ -881,14 +891,17 @@ test_expect_success 'use --set-upstream-to modify a particular branch' '
' '
test_expect_success '--unset-upstream should fail if given a non-existent branch' ' test_expect_success '--unset-upstream should fail if given a non-existent branch' '
test_must_fail git branch --unset-upstream i-dont-exist echo "fatal: Branch '"'"'i-dont-exist'"'"' has no upstream information" >expect &&
test_must_fail git branch --unset-upstream i-dont-exist 2>err &&
test_i18ncmp expect err
' '
test_expect_success '--unset-upstream should fail if config is locked' ' test_expect_success '--unset-upstream should fail if config is locked' '
test_when_finished "rm -f .git/config.lock" && test_when_finished "rm -f .git/config.lock" &&
git branch --set-upstream-to locked && git branch --set-upstream-to locked &&
>.git/config.lock && >.git/config.lock &&
test_must_fail git branch --unset-upstream test_must_fail git branch --unset-upstream 2>err &&
test_i18ngrep "could not lock config file .git/config: File exists" err
' '
test_expect_success 'test --unset-upstream on HEAD' ' test_expect_success 'test --unset-upstream on HEAD' '
@ -900,17 +913,23 @@ test_expect_success 'test --unset-upstream on HEAD' '
test_must_fail git config branch.master.remote && test_must_fail git config branch.master.remote &&
test_must_fail git config branch.master.merge && test_must_fail git config branch.master.merge &&
# fail for a branch without upstream set # fail for a branch without upstream set
test_must_fail git branch --unset-upstream echo "fatal: Branch '"'"'master'"'"' has no upstream information" >expect &&
test_must_fail git branch --unset-upstream 2>err &&
test_i18ncmp expect err
' '
test_expect_success '--unset-upstream should fail on multiple branches' ' test_expect_success '--unset-upstream should fail on multiple branches' '
test_must_fail git branch --unset-upstream a b c echo "fatal: too many arguments to unset upstream" >expect &&
test_must_fail git branch --unset-upstream a b c 2>err &&
test_i18ncmp expect err
' '
test_expect_success '--unset-upstream should fail on detached HEAD' ' test_expect_success '--unset-upstream should fail on detached HEAD' '
git checkout HEAD^{} && git checkout HEAD^{} &&
test_must_fail git branch --unset-upstream && test_when_finished git checkout - &&
git checkout - echo "fatal: could not unset upstream of HEAD when it does not point to any branch." >expect &&
test_must_fail git branch --unset-upstream 2>err &&
test_i18ncmp expect err
' '
test_expect_success 'test --unset-upstream on a particular branch' ' test_expect_success 'test --unset-upstream on a particular branch' '