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>
Ævar Arnfjörð Bjarmason committed
Jul 28, 2010 at 10:34 UTC
8c42791061b2e9231e8ff64dd5f6e7eeacd2c1cf
1 file changed
+11
-13
t/t5800-remote-helpers.sh
+11
-13
@@ -13,13 +13,11 @@ if sys.hexversion < 0x02040000:
13
sys.exit(1)
14
'
15
then
16
- :
17
-else
18
- skip_all='skipping git remote-testgit tests: requires Python 2.4 or newer'
19
- test_done
16
+ # Requires Python 2.4 or newer
17
+ test_set_prereq PYTHON_24
18
fi
19
22
-test_expect_success 'setup repository' '
20
+test_expect_success PYTHON_24 'setup repository' '
21
git init --bare server/.git &&
22
git clone server public &&
23
(cd public &&
@@ -29,34 +27,34 @@ test_expect_success 'setup repository' '
27
git push origin master)
28
'
29
32
-test_expect_success 'cloning from local repo' '
30
+test_expect_success PYTHON_24 'cloning from local repo' '
31
git clone "testgit::${PWD}/server" localclone &&
32
test_cmp public/file localclone/file
33
'
34
37
-test_expect_success 'cloning from remote repo' '
35
+test_expect_success PYTHON_24 'cloning from remote repo' '
36
git clone "testgit::file://${PWD}/server" clone &&
37
test_cmp public/file clone/file
38
'
39
42
-test_expect_success 'create new commit on remote' '
40
+test_expect_success PYTHON_24 'create new commit on remote' '
41
(cd public &&
42
echo content >>file &&
43
git commit -a -m two &&
44
git push)
45
'
46
49
-test_expect_success 'pulling from local repo' '
47
+test_expect_success PYTHON_24 'pulling from local repo' '
48
(cd localclone && git pull) &&
49
test_cmp public/file localclone/file
50
'
51
54
-test_expect_success 'pulling from remote remote' '
52
+test_expect_success PYTHON_24 'pulling from remote remote' '
53
(cd clone && git pull) &&
54
test_cmp public/file clone/file
55
'
56
59
-test_expect_success 'pushing to local repo' '
57
+test_expect_success PYTHON_24 'pushing to local repo' '
58
(cd localclone &&
59
echo content >>file &&
60
git commit -a -m three &&
@@ -65,12 +63,12 @@ test_expect_success 'pushing to local repo' '
63
test $HEAD = $(git --git-dir=server/.git rev-parse --verify HEAD)
64
'
65
68
-test_expect_success 'synch with changes from localclone' '
66
+test_expect_success PYTHON_24 'synch with changes from localclone' '
67
(cd clone &&
68
git pull)
69
'
70
73
-test_expect_success 'pushing remote local repo' '
71
+test_expect_success PYTHON_24 'pushing remote local repo' '
72
(cd clone &&
73
echo content >>file &&
74
git commit -a -m four &&