Skip to content

Commit 7241401

Browse files
committed
ENH: skip test_is_ancestor on git versions < 1.8.0 not supporting git merge-base --is-ancestor
1 parent ad39313 commit 7241401

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

git/test/test_repo.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,12 @@ def test_merge_base(self):
771771
# Test for no merge base - can't do as we have
772772
self.failUnlessRaises(GitCommandError, repo.merge_base, c1, 'ffffff')
773773

774-
def test_is_ancestor(self):
774+
@with_rw_directory
775+
def test_is_ancestor(self, rw_dir):
776+
git = Git(rw_dir)
777+
if git.version_info[:3] < (1, 8, 0):
778+
raise SkipTest("git merge-base --is-ancestor feature unsupported")
779+
775780
repo = self.rorepo
776781
c1 = 'f6aa8d1'
777782
c2 = '763ef75'

0 commit comments

Comments
 (0)