ENH: skip test_is_ancestor on git versions < 1.8.0 not supporting git merge-base --is-ancestor

yarikoptic · yarikoptic · commit 4e4a2e9f1fb0 · 2016-02-14T11:31:30.000-05:00
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 = Git(rw_dir)
+ if git.version_info[:3] < (1, 8, 0):
+ raise SkipTest("git merge-base --is-ancestor feature unsupported")
+
 repo = self.rorepo
 c1 = 'f6aa8d1'
 c2 = '763ef75'

-Original file line number
+Diff line change
 self.failUnlessRaises(GitCommandError, repo.merge_base, c1, 'ffffff')
 deftest_is_ancestor(self):
 +git=Git(rw_dir)
 +ifgit.version_info[:3] < (1, 8, 0):
 +raiseSkipTest("git merge-base --is-ancestor feature unsupported")
++
 repo=self.rorepo
 c1='f6aa8d1'
 c2='763ef75'