From 1815563ec44868121ae7fa0f09e3f23cacbb2700 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 5 Feb 2016 19:59:43 -0500 Subject: ENH: skip test_is_ancestor on git versions < 1.8.0 not supporting git merge-base --is-ancestor --- git/test/test_repo.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'git/test/test_repo.py') diff --git a/git/test/test_repo.py b/git/test/test_repo.py index 241b4027..5035cbb9 100644 --- a/git/test/test_repo.py +++ b/git/test/test_repo.py @@ -772,6 +772,10 @@ class TestRepo(TestBase): self.failUnlessRaises(GitCommandError, repo.merge_base, c1, 'ffffff') def test_is_ancestor(self): + git = self.rorepo.git + if git.version_info[:3] < (1, 8, 0): + raise SkipTest("git merge-base --is-ancestor feature unsupported") + repo = self.rorepo c1 = 'f6aa8d1' c2 = '763ef75' -- cgit v1.2.1