Merge pull request gitpython-developers#385 from yarikoptic/skip-test

Byron · Byron · commit 8e9481b4ddd7 · 2016-02-25T07:42:04.000+01:00
ENH: skip test_is_ancestor on git versions &lt; 1.8.0 not supporting git merge-base --is-ancestor
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
@@ -772,6 +772,10 @@ def test_merge_base(self):
         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'
