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

t5800: use skip_all instead of prereq

Browse Source 
All tests require python 2.4 or higher.

Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sverre Rabbelier 2011-07-16 15:03:23 +02:00 committed by Junio C Hamano
parent 5cf5ade371
commit 760fec7d7e
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,15 +7,19 @@ test_description='Test remote-helper import and export commands'
. ./test-lib.sh
if test_have_prereq PYTHON && "$PYTHON_PATH" -c '
if ! test_have_prereq PYTHON ; then
skip_all='skipping git-remote-hg tests, python not available'
test_done
fi
"$PYTHON_PATH" -c '
import sys
if sys.hexversion < 0x02040000:
sys.exit(1)
'
then
# Requires Python 2.4 or newer
test_set_prereq PYTHON_24
fi
' || {
skip_all='skipping git-remote-hg tests, python version < 2.4'
test_done
}
compare_refs() {
git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
@ -23,7 +27,7 @@ compare_refs() {
test_cmp expect actual
}
test_expect_success PYTHON_24 'setup repository' '
test_expect_success 'setup repository' '
git init --bare server/.git &&
git clone server public &&
(cd public &&
@ -33,34 +37,34 @@ test_expect_success PYTHON_24 'setup repository' '
git push origin master)
'
test_expect_success PYTHON_24 'cloning from local repo' '
test_expect_success 'cloning from local repo' '
git clone "testgit::${PWD}/server" localclone &&
test_cmp public/file localclone/file
'
test_expect_success PYTHON_24 'cloning from remote repo' '
test_expect_success 'cloning from remote repo' '
git clone "testgit::file://${PWD}/server" clone &&
test_cmp public/file clone/file
'
test_expect_success PYTHON_24 'create new commit on remote' '
test_expect_success 'create new commit on remote' '
(cd public &&
echo content >>file &&
git commit -a -m two &&
git push)
'
test_expect_success PYTHON_24 'pulling from local repo' '
test_expect_success 'pulling from local repo' '
(cd localclone && git pull) &&
test_cmp public/file localclone/file
'
test_expect_success PYTHON_24 'pulling from remote remote' '
test_expect_success 'pulling from remote remote' '
(cd clone && git pull) &&
test_cmp public/file clone/file
'
test_expect_success PYTHON_24 'pushing to local repo' '
test_expect_success 'pushing to local repo' '
(cd localclone &&
echo content >>file &&
git commit -a -m three &&
@ -68,12 +72,12 @@ test_expect_success PYTHON_24 'pushing to local repo' '
compare_refs localclone HEAD server HEAD
'
test_expect_success PYTHON_24 'synch with changes from localclone' '
test_expect_success 'synch with changes from localclone' '
(cd clone &&
git pull)
'
test_expect_success PYTHON_24 'pushing remote local repo' '
test_expect_success 'pushing remote local repo' '
(cd clone &&
echo content >>file &&
git commit -a -m four &&