Skip to content

Commit

Permalink
t0020: use test_* helpers instead of hand-rolled messages
Browse files Browse the repository at this point in the history
These tests are not wrong, but it is much shorter and more
idiomatic to say "verbose" or "test_must_fail" rather than
printing our own messages on failure. Likewise, there is no
need to say "happy" at the end of a test; the test suite
takes care of that.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Mar 25, 2015
1 parent c6587bd commit be86fb3
Showing 1 changed file with 5 additions and 33 deletions.
38 changes: 5 additions & 33 deletions t/t0020-crlf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ test_expect_success setup '
for w in Some extra lines here; do echo $w; done >>one &&
git diff >patch.file &&
patched=$(git hash-object --stdin <one) &&
git read-tree --reset -u HEAD &&
echo happy.
git read-tree --reset -u HEAD
'

test_expect_success 'safecrlf: autocrlf=input, all CRLF' '
Expand Down Expand Up @@ -225,29 +223,9 @@ test_expect_success '.gitattributes says two is binary' '
git config core.autocrlf true &&
git read-tree --reset -u HEAD &&
if has_cr dir/two
then
echo "Huh?"
false
else
: happy
fi &&
if has_cr one
then
: happy
else
echo "Huh?"
false
fi &&
if has_cr three
then
echo "Huh?"
false
else
: happy
fi
test_must_fail has_cr dir/two &&
verbose has_cr one &&
test_must_fail has_cr three
'

test_expect_success '.gitattributes says two is input' '
Expand All @@ -256,13 +234,7 @@ test_expect_success '.gitattributes says two is input' '
echo "two crlf=input" >.gitattributes &&
git read-tree --reset -u HEAD &&
if has_cr dir/two
then
echo "Huh?"
false
else
: happy
fi
test_must_fail has_cr dir/two
'

test_expect_success '.gitattributes says two and three are text' '
Expand Down

0 comments on commit be86fb3

Please sign in to comment.