(self)
| 1886 | self.assertEqual(commit, None) |
| 1887 | |
| 1888 | def testMergeWithConflict(self): |
| 1889 | with self.assertRaises(github.GithubException) as raisedexp: |
| 1890 | self.repo.merge("branchForBase", "branchForHead") |
| 1891 | self.assertEqual(raisedexp.exception.message, "Merge conflict") |
| 1892 | self.assertEqual(raisedexp.exception.status, 409) |
| 1893 | self.assertEqual(raisedexp.exception.data, {"message": "Merge conflict"}) |
| 1894 | |
| 1895 | def testMergeUpstreamSuccess(self): |
| 1896 | # Use fork for being able to update it |