openstack/deb-python-pygit2
Code Issues Proposed changes

tests: fix deprecation warning

Browse Source
This commit is contained in:
J. David Ibáñez
2013-12-24 10:51:02 +01:00
parent d04823c3c8
commit cde2456327
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
test/test_repository.py
View File

@@ -313,8 +313,8 @@ class RepositoryTest_III(utils.RepoTestCaseForMerging):
merge_result = self.repo.merge(branch_oid)
self.assertTrue(merge_result.is_uptodate)
self.assertFalse(merge_result.is_fastforward)
self.assertEquals(None, merge_result.fastforward_oid)
self.assertEquals({}, self.repo.status())
self.assertEqual(None, merge_result.fastforward_oid)
self.assertEqual({}, self.repo.status())
def test_merge_fastforward(self):
branch_head_hex = 'e97b4cfd5db0fb4ebabf4f203979ca4e5d1c7c87'
@@ -323,9 +323,9 @@ class RepositoryTest_III(utils.RepoTestCaseForMerging):
self.assertFalse(merge_result.is_uptodate)
self.assertTrue(merge_result.is_fastforward)
# Asking twice to assure the reference counting is correct
self.assertEquals(branch_head_hex, merge_result.fastforward_oid.hex)
self.assertEquals(branch_head_hex, merge_result.fastforward_oid.hex)
self.assertEquals({}, self.repo.status())
self.assertEqual(branch_head_hex, merge_result.fastforward_oid.hex)
self.assertEqual(branch_head_hex, merge_result.fastforward_oid.hex)
self.assertEqual({}, self.repo.status())
def test_merge_no_fastforward_no_conflicts(self):
branch_head_hex = '03490f16b15a09913edb3a067a3dc67fbb8d41f1'
@@ -334,14 +334,14 @@ class RepositoryTest_III(utils.RepoTestCaseForMerging):
self.assertFalse(merge_result.is_uptodate)
self.assertFalse(merge_result.is_fastforward)
# Asking twice to assure the reference counting is correct
self.assertEquals(None, merge_result.fastforward_oid)
self.assertEquals(None, merge_result.fastforward_oid)
self.assertEquals({'bye.txt': 1}, self.repo.status())
self.assertEquals({'bye.txt': 1}, self.repo.status())
self.assertEqual(None, merge_result.fastforward_oid)
self.assertEqual(None, merge_result.fastforward_oid)
self.assertEqual({'bye.txt': 1}, self.repo.status())
self.assertEqual({'bye.txt': 1}, self.repo.status())
# Checking the index works as expected
self.repo.index.remove('bye.txt')
self.repo.index.write()
self.assertEquals({'bye.txt': 128}, self.repo.status())
self.assertEqual({'bye.txt': 128}, self.repo.status())
def test_merge_no_fastforward_conflicts(self):
branch_head_hex = '1b2bae55ac95a4be3f8983b86cd579226d0eb247'
@@ -350,14 +350,14 @@ class RepositoryTest_III(utils.RepoTestCaseForMerging):
self.assertFalse(merge_result.is_uptodate)
self.assertFalse(merge_result.is_fastforward)
# Asking twice to assure the reference counting is correct
self.assertEquals(None, merge_result.fastforward_oid)
self.assertEquals(None, merge_result.fastforward_oid)
self.assertEquals({'.gitignore': 132}, self.repo.status())
self.assertEquals({'.gitignore': 132}, self.repo.status())
self.assertEqual(None, merge_result.fastforward_oid)
self.assertEqual(None, merge_result.fastforward_oid)
self.assertEqual({'.gitignore': 132}, self.repo.status())
self.assertEqual({'.gitignore': 132}, self.repo.status())
# Checking the index works as expected
self.repo.index.add('.gitignore')
self.repo.index.write()
self.assertEquals({'.gitignore': 2}, self.repo.status())
self.assertEqual({'.gitignore': 2}, self.repo.status())
def test_merge_invalid_hex(self):
branch_head_hex = '12345678'