undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t1300: style updates

Browse Source 
The t1300 test script is quite old, and does not use our
modern techniques or styles. This patch updates it in the
following ways:

  1. Use test_cmp instead of cmp (to make failures easier to
     debug).

  2. Use test_cmp instead of 'test $(command) = expected'.
     This makes failures much easier to debug, and also
     makes sure that $(command) exits appropriately.

  3. Use test_must_fail (easier to read, and checks more
     rigorously for signal death).

  4. Write tests with the usual style of:

       test_expect_success 'test name' '
               test commands &&
	       ...
       '

     rather than one-liners, or using backslash-continuation.
     This is purely a style fixup.

There are still a few command happening outside of
test_expect invocations, but they are all innoccuous system
commands like "cat" and "cp". In an ideal world, each test
would be self sufficient and all commands would happen
inside test_expect, but it is not immediately obvious how
the grouping should work (some of the commands impact the
subsequent tests, and some of them are setting up and
modifying state that many tests depend on). This patch just
picks the low-hanging style fruit, and we can do more fixes
on top later.

Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
Jeff King 2012-10-23 14:59:26 -04:00
parent 8c7a786b6c
commit ed838e6615
1 changed files with 178 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

293
t/t1300-repo-config.sh
View File

@ -55,11 +55,13 @@ test_expect_success 'uppercase section' '
test_cmp expect .git/config test_cmp expect .git/config
' '
test_expect_success 'replace with non-match' \ test_expect_success 'replace with non-match' '
'git config core.penguin kingpin !blue' git config core.penguin kingpin !blue
'
test_expect_success 'replace with non-match (actually matching)' \ test_expect_success 'replace with non-match (actually matching)' '
'git config core.penguin "very blue" !kingpin' git config core.penguin "very blue" !kingpin
'
cat > expect << EOF cat > expect << EOF
[core] [core]
@ -108,8 +110,9 @@ baz = multiple \
lines lines
EOF EOF
test_expect_success 'unset with cont. lines' \ test_expect_success 'unset with cont. lines' '
'git config --unset beta.baz' git config --unset beta.baz
'
cat > expect <<\EOF cat > expect <<\EOF
[alpha] [alpha]
@ -133,8 +136,9 @@ EOF
cp .git/config .git/config2 cp .git/config .git/config2
test_expect_success 'multiple unset' \ test_expect_success 'multiple unset' '
'git config --unset-all beta.haha' git config --unset-all beta.haha
'
cat > expect << EOF cat > expect << EOF
[beta] ; silly comment # another comment [beta] ; silly comment # another comment
@ -145,7 +149,9 @@ noIndent= sillyValue ; 'nother silly comment
[nextSection] noNewline = ouch [nextSection] noNewline = ouch
EOF EOF
test_expect_success 'multiple unset is correct' 'test_cmp expect .git/config' test_expect_success 'multiple unset is correct' '
test_cmp expect .git/config
'
cp .git/config2 .git/config cp .git/config2 .git/config
@ -156,8 +162,9 @@ test_expect_success '--replace-all missing value' '
rm .git/config2 rm .git/config2
test_expect_success '--replace-all' \ test_expect_success '--replace-all' '
'git config --replace-all beta.haha gamma' git config --replace-all beta.haha gamma
'
cat > expect << EOF cat > expect << EOF
[beta] ; silly comment # another comment [beta] ; silly comment # another comment
@ -169,7 +176,9 @@ noIndent= sillyValue ; 'nother silly comment
[nextSection] noNewline = ouch [nextSection] noNewline = ouch
EOF EOF
test_expect_success 'all replaced' 'test_cmp expect .git/config' test_expect_success 'all replaced' '
test_cmp expect .git/config
'
cat > expect << EOF cat > expect << EOF
[beta] ; silly comment # another comment [beta] ; silly comment # another comment
@ -200,7 +209,11 @@ test_expect_success 'really really mean test' '
test_cmp expect .git/config test_cmp expect .git/config
' '
test_expect_success 'get value' 'test alpha = $(git config beta.haha)' test_expect_success 'get value' '
echo alpha >expect &&
git config beta.haha >actual &&
test_cmp expect actual
'
cat > expect << EOF cat > expect << EOF
[beta] ; silly comment # another comment [beta] ; silly comment # another comment
@ -231,18 +244,23 @@ test_expect_success 'multivar' '
test_cmp expect .git/config test_cmp expect .git/config
' '
test_expect_success 'non-match' \ test_expect_success 'non-match' '
'git config --get nextsection.nonewline !for' git config --get nextsection.nonewline !for
'
test_expect_success 'non-match value' \ test_expect_success 'non-match value' '
'test wow = $(git config --get nextsection.nonewline !for)' echo wow >expect &&
git config --get nextsection.nonewline !for >actual &&
test_cmp expect actual
'
test_expect_success 'ambiguous get' ' test_expect_success 'ambiguous get' '
test_must_fail git config --get nextsection.nonewline test_must_fail git config --get nextsection.nonewline
' '
test_expect_success 'get multivar' \ test_expect_success 'get multivar' '
'git config --get-all nextsection.nonewline' git config --get-all nextsection.nonewline
'
cat > expect << EOF cat > expect << EOF
[beta] ; silly comment # another comment [beta] ; silly comment # another comment
@ -290,8 +308,9 @@ test_expect_success 'invalid key' 'test_must_fail git config inval.2key blabla'
test_expect_success 'correct key' 'git config 123456.a123 987' test_expect_success 'correct key' 'git config 123456.a123 987'
test_expect_success 'hierarchical section' \ test_expect_success 'hierarchical section' '
'git config Version.1.2.3eX.Alpha beta' git config Version.1.2.3eX.Alpha beta
'
cat > expect << EOF cat > expect << EOF
[beta] ; silly comment # another comment [beta] ; silly comment # another comment
@ -307,7 +326,9 @@ noIndent= sillyValue ; 'nother silly comment
Alpha = beta Alpha = beta
EOF EOF
test_expect_success 'hierarchical section value' 'test_cmp expect .git/config' test_expect_success 'hierarchical section value' '
test_cmp expect .git/config
'
cat > expect << EOF cat > expect << EOF
beta.noindent=sillyValue beta.noindent=sillyValue
@ -316,9 +337,10 @@ nextsection.nonewline=wow2 for me
version.1.2.3eX.alpha=beta version.1.2.3eX.alpha=beta
EOF EOF
test_expect_success 'working --list' \ test_expect_success 'working --list' '
'git config --list > output && cmp output expect' git config --list > output &&
test_cmp expect output
'
cat > expect << EOF cat > expect << EOF
EOF EOF
@ -332,8 +354,10 @@ beta.noindent sillyValue
nextsection.nonewline wow2 for me nextsection.nonewline wow2 for me
EOF EOF
test_expect_success '--get-regexp' \ test_expect_success '--get-regexp' '
'git config --get-regexp in > output && cmp output expect' git config --get-regexp in >output &&
test_cmp expect output
'
cat > expect << EOF cat > expect << EOF
wow2 for me wow2 for me
@ -353,41 +377,48 @@ cat > .git/config << EOF
variable = variable =
EOF EOF
test_expect_success 'get variable with no value' \ test_expect_success 'get variable with no value' '
'git config --get novalue.variable ^$' git config --get novalue.variable ^$
'
test_expect_success 'get variable with empty value' \ test_expect_success 'get variable with empty value' '
'git config --get emptyvalue.variable ^$' git config --get emptyvalue.variable ^$
'
echo novalue.variable > expect echo novalue.variable > expect
test_expect_success 'get-regexp variable with no value' \ test_expect_success 'get-regexp variable with no value' '
'git config --get-regexp novalue > output && git config --get-regexp novalue > output &&
cmp output expect' test_cmp expect output
'
echo 'novalue.variable true' > expect echo 'novalue.variable true' > expect
test_expect_success 'get-regexp --bool variable with no value' \ test_expect_success 'get-regexp --bool variable with no value' '
'git config --bool --get-regexp novalue > output && git config --bool --get-regexp novalue > output &&
cmp output expect' test_cmp expect output
'
echo 'emptyvalue.variable ' > expect echo 'emptyvalue.variable ' > expect
test_expect_success 'get-regexp variable with empty value' \ test_expect_success 'get-regexp variable with empty value' '
'git config --get-regexp emptyvalue > output && git config --get-regexp emptyvalue > output &&
cmp output expect' test_cmp expect output
'
echo true > expect echo true > expect
test_expect_success 'get bool variable with no value' \ test_expect_success 'get bool variable with no value' '
'git config --bool novalue.variable > output && git config --bool novalue.variable > output &&
cmp output expect' test_cmp expect output
'
echo false > expect echo false > expect
test_expect_success 'get bool variable with empty value' \ test_expect_success 'get bool variable with empty value' '
'git config --bool emptyvalue.variable > output && git config --bool emptyvalue.variable > output &&
cmp output expect' test_cmp expect output
'
test_expect_success 'no arguments, but no crash' ' test_expect_success 'no arguments, but no crash' '
test_must_fail git config >output 2>&1 && test_must_fail git config >output 2>&1 &&
@ -427,8 +458,9 @@ test_expect_success 'new variable inserts into proper section' '
test_cmp expect .git/config test_cmp expect .git/config
' '
test_expect_success 'alternative GIT_CONFIG (non-existing file should fail)' \ test_expect_success 'alternative GIT_CONFIG (non-existing file should fail)' '
'test_must_fail git config --file non-existing-config -l' test_must_fail git config --file non-existing-config -l
'
cat > other-config << EOF cat > other-config << EOF
[ein] [ein]
@ -444,8 +476,10 @@ test_expect_success 'alternative GIT_CONFIG' '
test_cmp expect output test_cmp expect output
' '
test_expect_success 'alternative GIT_CONFIG (--file)' \ test_expect_success 'alternative GIT_CONFIG (--file)' '
'git config --file other-config -l > output && cmp output expect' git config --file other-config -l > output &&
test_cmp expect output
'
test_expect_success 'refer config from subdirectory' ' test_expect_success 'refer config from subdirectory' '
mkdir x && mkdir x &&
@ -489,8 +523,9 @@ cat > .git/config << EOF
weird weird
EOF EOF
test_expect_success "rename section" \ test_expect_success 'rename section' '
"git config --rename-section branch.eins branch.zwei" git config --rename-section branch.eins branch.zwei
'
cat > expect << EOF cat > expect << EOF
# Hallo # Hallo
@ -503,17 +538,22 @@ cat > expect << EOF
weird weird
EOF EOF
test_expect_success "rename succeeded" "test_cmp expect .git/config" test_expect_success 'rename succeeded' '
test_cmp expect .git/config
'
test_expect_success "rename non-existing section" ' test_expect_success 'rename non-existing section' '
test_must_fail git config --rename-section \ test_must_fail git config --rename-section \
branch."world domination" branch.drei branch."world domination" branch.drei
' '
test_expect_success "rename succeeded" "test_cmp expect .git/config" test_expect_success 'rename succeeded' '
test_cmp expect .git/config
'
test_expect_success "rename another section" \ test_expect_success 'rename another section' '
'git config --rename-section branch."1 234 blabl/a" branch.drei' git config --rename-section branch."1 234 blabl/a" branch.drei
'
cat > expect << EOF cat > expect << EOF
# Hallo # Hallo
@ -526,14 +566,17 @@ cat > expect << EOF
weird weird
EOF EOF
test_expect_success "rename succeeded" "test_cmp expect .git/config" test_expect_success 'rename succeeded' '
test_cmp expect .git/config
'
cat >> .git/config << EOF cat >> .git/config << EOF
[branch "vier"] z = 1 [branch "vier"] z = 1
EOF EOF
test_expect_success "rename a section with a var on the same line" \ test_expect_success 'rename a section with a var on the same line' '
'git config --rename-section branch.vier branch.zwei' git config --rename-section branch.vier branch.zwei
'
cat > expect << EOF cat > expect << EOF
# Hallo # Hallo
@ -548,7 +591,9 @@ weird
z = 1 z = 1
EOF EOF
test_expect_success "rename succeeded" "test_cmp expect .git/config" test_expect_success 'rename succeeded' '
test_cmp expect .git/config
'
test_expect_success 'renaming empty section name is rejected' ' test_expect_success 'renaming empty section name is rejected' '
test_must_fail git config --rename-section branch.zwei "" test_must_fail git config --rename-section branch.zwei ""
@ -562,7 +607,9 @@ cat >> .git/config << EOF
[branch "zwei"] a = 1 [branch "vier"] [branch "zwei"] a = 1 [branch "vier"]
EOF EOF
test_expect_success "remove section" "git config --remove-section branch.zwei" test_expect_success 'remove section' '
git config --remove-section branch.zwei
'
cat > expect << EOF cat > expect << EOF
# Hallo # Hallo
@ -571,8 +618,9 @@ cat > expect << EOF
weird weird
EOF EOF
test_expect_success "section was removed properly" \ test_expect_success 'section was removed properly' '
"test_cmp expect .git/config" test_cmp expect .git/config
'
cat > expect << EOF cat > expect << EOF
[gitcvs] [gitcvs]
@ -583,7 +631,6 @@ cat > expect << EOF
EOF EOF
test_expect_success 'section ending' ' test_expect_success 'section ending' '
rm -f .git/config && rm -f .git/config &&
git config gitcvs.enabled true && git config gitcvs.enabled true &&
git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite && git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
@ -593,30 +640,25 @@ test_expect_success 'section ending' '
' '
test_expect_success numbers ' test_expect_success numbers '
git config kilo.gram 1k && git config kilo.gram 1k &&
git config mega.ton 1m && git config mega.ton 1m &&
k=$(git config --int --get kilo.gram) && echo 1024 >expect &&
test z1024 = "z$k" && echo 1048576 >>expect &&
m=$(git config --int --get mega.ton) && git config --int --get kilo.gram >actual &&
test z1048576 = "z$m" git config --int --get mega.ton >>actual &&
test_cmp expect actual
' '
cat > expect <<EOF
fatal: bad config value for 'aninvalid.unit' in .git/config
EOF
test_expect_success 'invalid unit' ' test_expect_success 'invalid unit' '
git config aninvalid.unit "1auto" && git config aninvalid.unit "1auto" &&
s=$(git config aninvalid.unit) && echo 1auto >expect &&
test "z1auto" = "z$s" && git config aninvalid.unit >actual &&
if git config --int --get aninvalid.unit 2>actual test_cmp expect actual &&
then cat > expect <<-\EOF
echo config should have failed fatal: bad config value for '\''aninvalid.unit'\'' in .git/config
false EOF
fi && test_must_fail git config --int --get aninvalid.unit 2>actual &&
cmp actual expect test_cmp actual expect
' '
cat > expect << EOF cat > expect << EOF
@ -646,7 +688,7 @@ test_expect_success bool '
git config --bool --get bool.true$i >>result git config --bool --get bool.true$i >>result
git config --bool --get bool.false$i >>result git config --bool --get bool.false$i >>result
done && done &&
cmp expect result' test_cmp expect result'
test_expect_success 'invalid bool (--get)' ' test_expect_success 'invalid bool (--get)' '
@ -680,7 +722,7 @@ test_expect_success 'set --bool' '
git config --bool bool.false2 "" && git config --bool bool.false2 "" &&
git config --bool bool.false3 nO && git config --bool bool.false3 nO &&
git config --bool bool.false4 FALSE && git config --bool bool.false4 FALSE &&
cmp expect .git/config' test_cmp expect .git/config'
cat > expect <<\EOF cat > expect <<\EOF
[int] [int]
@ -695,39 +737,37 @@ test_expect_success 'set --int' '
git config --int int.val1 01 && git config --int int.val1 01 &&
git config --int int.val2 -1 && git config --int int.val2 -1 &&
git config --int int.val3 5m && git config --int int.val3 5m &&
cmp expect .git/config' test_cmp expect .git/config
'
cat >expect <<\EOF test_expect_success 'get --bool-or-int' '
cat >.git/config <<-\EOF &&
[bool] [bool]
true1 = true true1
true2 = true true2 = true
false1 = false false = false
false2 = false
[int] [int]
int1 = 0 int1 = 0
int2 = 1 int2 = 1
int3 = -1 int3 = -1
EOF EOF
cat >expect <<-\EOF &&
test_expect_success 'get --bool-or-int' ' true
rm -f .git/config && true
( false
echo "[bool]" 0
echo true1 1
echo true2 = true -1
echo false = false EOF
echo "[int]" {
echo int1 = 0 git config --bool-or-int bool.true1 &&
echo int2 = 1 git config --bool-or-int bool.true2 &&
echo int3 = -1 git config --bool-or-int bool.false &&
) >>.git/config && git config --bool-or-int int.int1 &&
test $(git config --bool-or-int bool.true1) = true && git config --bool-or-int int.int2 &&
test $(git config --bool-or-int bool.true2) = true && git config --bool-or-int int.int3
test $(git config --bool-or-int bool.false) = false && } >actual &&
test $(git config --bool-or-int int.int1) = 0 && test_cmp expect actual
test $(git config --bool-or-int int.int2) = 1 &&
test $(git config --bool-or-int int.int3) = -1
' '
cat >expect <<\EOF cat >expect <<\EOF
@ -844,7 +884,7 @@ EOF
test_expect_success 'value continued on next line' ' test_expect_success 'value continued on next line' '
git config --list > result && git config --list > result &&
cmp result expect test_cmp result expect
' '
cat > .git/config <<\EOF cat > .git/config <<\EOF
@ -880,11 +920,12 @@ test_expect_success '--null --get-regexp' '
test_expect_success 'inner whitespace kept verbatim' ' test_expect_success 'inner whitespace kept verbatim' '
git config section.val "foo bar" && git config section.val "foo bar" &&
test "z$(git config section.val)" = "zfoo bar" echo "foo bar" >expect &&
git config section.val >actual &&
test_cmp expect actual
' '
test_expect_success SYMLINKS 'symlinked configuration' ' test_expect_success SYMLINKS 'symlinked configuration' '
ln -s notyet myconfig && ln -s notyet myconfig &&
GIT_CONFIG=myconfig git config test.frotz nitfol && GIT_CONFIG=myconfig git config test.frotz nitfol &&
test -h myconfig && test -h myconfig &&
@ -893,9 +934,15 @@ test_expect_success SYMLINKS 'symlinked configuration' '
GIT_CONFIG=myconfig git config test.xyzzy rezrov && GIT_CONFIG=myconfig git config test.xyzzy rezrov &&
test -h myconfig && test -h myconfig &&
test -f notyet && test -f notyet &&
test "z$(GIT_CONFIG=notyet git config test.frotz)" = znitfol && cat >expect <<-\EOF &&
test "z$(GIT_CONFIG=notyet git config test.xyzzy)" = zrezrov nitfol
rezrov
EOF
{
GIT_CONFIG=notyet git config test.frotz &&
GIT_CONFIG=notyet git config test.xyzzy
} >actual &&
test_cmp expect actual
' '
test_expect_success 'nonexistent configuration' ' test_expect_success 'nonexistent configuration' '
@ -930,9 +977,17 @@ test_expect_success 'check split_cmdline return' "
" "
test_expect_success 'git -c "key=value" support' ' test_expect_success 'git -c "key=value" support' '
test "z$(git -c core.name=value config core.name)" = zvalue && cat >expect <<-\EOF &&
test "z$(git -c foo.CamelCase=value config foo.camelcase)" = zvalue && value
test "z$(git -c foo.flag config --bool foo.flag)" = ztrue && value
true
EOF
{
git -c core.name=value config core.name &&
git -c foo.CamelCase=value config foo.camelcase &&
git -c foo.flag config --bool foo.flag
} >actual &&
test_cmp expect actual &&
test_must_fail git -c name=value config core.name test_must_fail git -c name=value config core.name
' '