kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t/t5800-remote-helpers.sh: Skip with prereq on python <2.4 

Change the t/t5800-remote-helpers.sh test to skip with the the
three-arg prereq form of test_expect_success instead of bailing out.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2010-07-28 10:34:57 +00:00 committed by Junio C Hamano
parent f6c1998f14
commit 8c42791061
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
t/t5800-remote-helpers.sh
View File

@ -13,13 +13,11 @@ if sys.hexversion < 0x02040000:
sys.exit(1) sys.exit(1)
' '
then then
: # Requires Python 2.4 or newer
else test_set_prereq PYTHON_24
skip_all='skipping git remote-testgit tests: requires Python 2.4 or newer'
test_done
fi fi


test_expect_success 'setup repository' ' test_expect_success PYTHON_24 'setup repository' '
git init --bare server/.git && git init --bare server/.git &&
git clone server public && git clone server public &&
(cd public && (cd public &&
@ -29,34 +27,34 @@ test_expect_success 'setup repository' '
git push origin master) git push origin master)
' '


test_expect_success 'cloning from local repo' ' test_expect_success PYTHON_24 'cloning from local repo' '
git clone "testgit::${PWD}/server" localclone && git clone "testgit::${PWD}/server" localclone &&
test_cmp public/file localclone/file test_cmp public/file localclone/file
' '


test_expect_success 'cloning from remote repo' ' test_expect_success PYTHON_24 'cloning from remote repo' '
git clone "testgit::file://${PWD}/server" clone && git clone "testgit::file://${PWD}/server" clone &&
test_cmp public/file clone/file test_cmp public/file clone/file
' '


test_expect_success 'create new commit on remote' ' test_expect_success PYTHON_24 'create new commit on remote' '
(cd public && (cd public &&
echo content >>file && echo content >>file &&
git commit -a -m two && git commit -a -m two &&
git push) git push)
' '


test_expect_success 'pulling from local repo' ' test_expect_success PYTHON_24 'pulling from local repo' '
(cd localclone && git pull) && (cd localclone && git pull) &&
test_cmp public/file localclone/file test_cmp public/file localclone/file
' '


test_expect_success 'pulling from remote remote' ' test_expect_success PYTHON_24 'pulling from remote remote' '
(cd clone && git pull) && (cd clone && git pull) &&
test_cmp public/file clone/file test_cmp public/file clone/file
' '


test_expect_success 'pushing to local repo' ' test_expect_success PYTHON_24 'pushing to local repo' '
(cd localclone && (cd localclone &&
echo content >>file && echo content >>file &&
git commit -a -m three && git commit -a -m three &&
@ -65,12 +63,12 @@ test_expect_success 'pushing to local repo' '
test $HEAD = $(git --git-dir=server/.git rev-parse --verify HEAD) test $HEAD = $(git --git-dir=server/.git rev-parse --verify HEAD)
' '


test_expect_success 'synch with changes from localclone' ' test_expect_success PYTHON_24 'synch with changes from localclone' '
(cd clone && (cd clone &&
git pull) git pull)
' '


test_expect_success 'pushing remote local repo' ' test_expect_success PYTHON_24 'pushing remote local repo' '
(cd clone && (cd clone &&
echo content >>file && echo content >>file &&
git commit -a -m four && git commit -a -m four &&