aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-10-28 03:39:18 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2008-10-28 03:39:18 -0700
commitacf867e8cd12f31dcf0f9fff92f3a3c34912b751 (patch)
tree625e47f4497cfc4bfc7cecaa6a5356ecc1a89fb7
parentMerge branch 'upstream' into gentoo (diff)
downloadgitosis-dakkar-gentoo.tar.gz
gitosis-dakkar-gentoo.tar.bz2
gitosis-dakkar-gentoo.zip
Handle git-1.6 which installs example hooks with .sample as a suffix so they do not run.gentoo
-rw-r--r--gitosis/test/test_repository.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitosis/test/test_repository.py b/gitosis/test/test_repository.py
index 6bc9e76..0920c4a 100644
--- a/gitosis/test/test_repository.py
+++ b/gitosis/test/test_repository.py
@@ -70,7 +70,7 @@ def test_init_templates():
got = readFile(os.path.join(path, 'hooks', 'post-update'))
eq(got, '#!/bin/sh\n# i can override standard templates\n')
# standard templates are there, too
- assert os.path.isfile(os.path.join(path, 'hooks', 'pre-rebase'))
+ assert (os.path.isfile(os.path.join(path, 'hooks', 'pre-rebase.sample')) or os.path.isfile(os.path.join(path, 'hooks', 'pre-rebase')))
def test_init_environment():
tmp = maketemp()