[PATCH/RFC] checkout --detached test: write supporting files before start of tests
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Apr 13, 2012, 23:25 UTC
- Message-ID
- <20120413232535.GB13995@burratino>
- In-Reply-To
- <20120413225901.GA13220@burratino>
As a general rule, git's tests use the following layout:
- first, setting the --help description and including test-lib and other libraries
- next, writing static files and setting variables that will last through the entire script, and defining helper functions
- next, the test assertions themselves
This way it is visually obvious where the code for each test assertion begins and ends and there is no temptation to use command substitution to do nontrivial work outside of the test_expect_success / failure blocks.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- Jonathan Nieder wrote:
> Jeff King wrote:
Show 21 quoted lines
>> --- a/t/t2020-checkout-detach.sh >> +++ b/t/t2020-checkout-detach.sh >> @@ -126,4 +126,17 @@ test_expect_success 'checkout does not warn leaving reachable commit' ' >> check_no_orphan_warning stderr >> ' >> >> +cat >expect <<'EOF' >> +Your branch is behind 'master' by 1 commit, and can be fast-forwarded. >> +EOF >> +test_expect_success 'tracking count is accurate after orphan check' ' >> + reset && >> + git branch child master^ && >> + git config branch.child.remote . && >> + git config branch.child.merge refs/heads/master && >> + git checkout child^ && >> + git checkout child >stdout && >> + test_cmp expect stdout > > Should use test_i18ncmp to handle people who force tests to run in > other locales (like the fake GETTEXT_POISON locale). Quick patch > follows.
... and here's a patch on top to address an unrelated nit.
t/t2020-checkout-detach.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh index b37ce25c..c2c34664 100755 --- a/t/t2020-checkout-detach.sh +++ b/t/t2020-checkout-detach.sh @@ -3,6 +3,10 @@ test_description='checkout into detached HEAD state' . ./test-lib.sh +cat >master-1-ahead.message <<'EOF' +Your branch is behind 'master' by 1 commit, and can be fast-forwarded. +EOF + check_detached () { test_must_fail git symbolic-ref -q HEAD >/dev/null } @@ -138,10 +142,8 @@ test_expect_success 'checkout does not warn leaving reachable commit' ' check_no_orphan_warning stderr ' -cat >expect <<'EOF' -Your branch is behind 'master' by 1 commit, and can be fast-forwarded. -EOF test_expect_success 'tracking count is accurate after orphan check' ' + cp master-1-ahead.message expect && reset && git branch child master^ && git config branch.child.remote . &&
-- 1.7.10