t5602 (clone-remote-exec): add missing &&

Also add a couple test_must_fail invocations where needed, and avoid
one-shot environment variable export and function calls.

Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2010-10-03 14:00:08 -06:00 коммит произвёл Junio C Hamano
Родитель 5935c581df
Коммит 771cf1dab9
1 изменённых файлов: 15 добавлений и 7 удалений

Просмотреть файл

@ -5,21 +5,29 @@ test_description=clone
. ./test-lib.sh
test_expect_success setup '
echo "#!/bin/sh" > not_ssh
echo "echo \"\$*\" > not_ssh_output" >> not_ssh
echo "exit 1" >> not_ssh
echo "#!/bin/sh" > not_ssh &&
echo "echo \"\$*\" > not_ssh_output" >> not_ssh &&
echo "exit 1" >> not_ssh &&
chmod +x not_ssh
'
test_expect_success 'clone calls git upload-pack unqualified with no -u option' '
GIT_SSH=./not_ssh git clone localhost:/path/to/repo junk
echo "localhost git-upload-pack '\''/path/to/repo'\''" >expected
(
GIT_SSH=./not_ssh &&
export GIT_SSH &&
test_must_fail git clone localhost:/path/to/repo junk
) &&
echo "localhost git-upload-pack '\''/path/to/repo'\''" >expected &&
test_cmp expected not_ssh_output
'
test_expect_success 'clone calls specified git upload-pack with -u option' '
GIT_SSH=./not_ssh git clone -u ./something/bin/git-upload-pack localhost:/path/to/repo junk
echo "localhost ./something/bin/git-upload-pack '\''/path/to/repo'\''" >expected
(
GIT_SSH=./not_ssh &&
export GIT_SSH &&
test_must_fail git clone -u ./something/bin/git-upload-pack localhost:/path/to/repo junk
) &&
echo "localhost ./something/bin/git-upload-pack '\''/path/to/repo'\''" >expected &&
test_cmp expected not_ssh_output
'