Browse Source

t5512 (ls-remote): modernize style

Prepare expected output inside test_expect_success that uses it.
Also remove excess blank lines.

Signed-off-by: Tom Grennan <tmgrennan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Tom Grennan 13 years ago committed by Junio C Hamano
parent
commit
fe6c64ab0b
  1. 27
      t/t5512-ls-remote.sh

27
t/t5512-ls-remote.sh

@ -5,7 +5,6 @@ test_description='git ls-remote' @@ -5,7 +5,6 @@ test_description='git ls-remote'
. ./test-lib.sh

test_expect_success setup '

>file &&
git add file &&
test_tick &&
@ -18,45 +17,33 @@ test_expect_success setup ' @@ -18,45 +17,33 @@ test_expect_success setup '
) >expected.all &&

git remote add self "$(pwd)/.git"

'

test_expect_success 'ls-remote --tags .git' '

git ls-remote --tags .git >actual &&
test_cmp expected.tag actual

'

test_expect_success 'ls-remote .git' '

git ls-remote .git >actual &&
test_cmp expected.all actual

'

test_expect_success 'ls-remote --tags self' '

git ls-remote --tags self >actual &&
test_cmp expected.tag actual

'

test_expect_success 'ls-remote self' '

git ls-remote self >actual &&
test_cmp expected.all actual

'

test_expect_success 'dies when no remote specified and no default remotes found' '

test_must_fail git ls-remote

'

test_expect_success 'use "origin" when no remote specified' '

URL="$(pwd)/.git" &&
echo "From $URL" >exp_err &&

@ -65,18 +52,14 @@ test_expect_success 'use "origin" when no remote specified' ' @@ -65,18 +52,14 @@ test_expect_success 'use "origin" when no remote specified' '

test_cmp exp_err actual_err &&
test_cmp expected.all actual

'

test_expect_success 'suppress "From <url>" with -q' '

git ls-remote -q 2>actual_err &&
test_must_fail test_cmp exp_err actual_err

'

test_expect_success 'use branch.<name>.remote if possible' '

#
# Test that we are indeed using branch.<name>.remote, not "origin", even
# though the "origin" remote has been set.
@ -99,14 +82,13 @@ test_expect_success 'use branch.<name>.remote if possible' ' @@ -99,14 +82,13 @@ test_expect_success 'use branch.<name>.remote if possible' '
git ls-remote 2>actual_err >actual &&
test_cmp exp_err actual_err &&
test_cmp exp actual

'

cat >exp <<EOF
fatal: 'refs*master' does not appear to be a git repository
fatal: The remote end hung up unexpectedly
EOF
test_expect_success 'confuses pattern as remote when no remote specified' '
cat >exp <<-\EOF &&
fatal: '\''refs*master'\'' does not appear to be a git repository
fatal: The remote end hung up unexpectedly
EOF
#
# Do not expect "git ls-remote <pattern>" to work; ls-remote, correctly,
# confuses <pattern> for <remote>. Although ugly, this behaviour is akin
@ -120,7 +102,6 @@ test_expect_success 'confuses pattern as remote when no remote specified' ' @@ -120,7 +102,6 @@ test_expect_success 'confuses pattern as remote when no remote specified' '
# role as a pattern.
test_must_fail git ls-remote refs*master >actual 2>&1 &&
test_cmp exp actual

'

test_expect_success 'die with non-2 for wrong repository even with --exit-code' '

Loading…
Cancel
Save