Commit8e9481b

committed

Merge pull request#385 from yarikoptic/skip-test

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

2 parents9f4af7c +1815563 commit8e9481bCopy full SHA for 8e9481b

File tree

-0

lines changed

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -772,6 +772,10 @@ def test_merge_base(self):`
`772`	`772`	`self.failUnlessRaises(GitCommandError,repo.merge_base,c1,'ffffff')`
`773`	`773`
`774`	`774`	`deftest_is_ancestor(self):`
	`775`	`+git=self.rorepo.git`
	`776`	`+ifgit.version_info[:3]< (1,8,0):`
	`777`	`+raiseSkipTest("git merge-base --is-ancestor feature unsupported")`
	`778`	`+`
`775`	`779`	`repo=self.rorepo`
`776`	`780`	`c1='f6aa8d1'`
`777`	`781`	`c2='763ef75'`

Comments

(0)