diff --git a/test/data/testrepo.git/objects/10/2374bdb1e8efca5e66cded18fd8f30571654a5 b/test/data/testrepo.git/objects/10/2374bdb1e8efca5e66cded18fd8f30571654a5 new file mode 100644 index 0000000..4cb6eb7 Binary files /dev/null and b/test/data/testrepo.git/objects/10/2374bdb1e8efca5e66cded18fd8f30571654a5 differ diff --git a/test/data/testrepo.git/objects/11/19926b06311143cab273f0af84eae77f5b3462 b/test/data/testrepo.git/objects/11/19926b06311143cab273f0af84eae77f5b3462 new file mode 100644 index 0000000..8ac529e Binary files /dev/null and b/test/data/testrepo.git/objects/11/19926b06311143cab273f0af84eae77f5b3462 differ diff --git a/test/data/testrepo.git/objects/19/bf31524643d743751b09cf719456914bbd8bd5 b/test/data/testrepo.git/objects/19/bf31524643d743751b09cf719456914bbd8bd5 new file mode 100644 index 0000000..af11713 Binary files /dev/null and b/test/data/testrepo.git/objects/19/bf31524643d743751b09cf719456914bbd8bd5 differ diff --git a/test/data/testrepo.git/objects/55/60f04f38a674decf34d16d7c7476642fa03794 b/test/data/testrepo.git/objects/55/60f04f38a674decf34d16d7c7476642fa03794 new file mode 100644 index 0000000..16bf738 Binary files /dev/null and b/test/data/testrepo.git/objects/55/60f04f38a674decf34d16d7c7476642fa03794 differ diff --git a/test/data/testrepo.git/objects/78/4855caf26449a1914d2cf62d12b9374d76ae78 b/test/data/testrepo.git/objects/78/4855caf26449a1914d2cf62d12b9374d76ae78 new file mode 100644 index 0000000..69cb9de Binary files /dev/null and b/test/data/testrepo.git/objects/78/4855caf26449a1914d2cf62d12b9374d76ae78 differ diff --git a/test/data/testrepo.git/objects/f5/e5aa4e36ab0fe62ee1ccc6eb8f79b866863b87 b/test/data/testrepo.git/objects/f5/e5aa4e36ab0fe62ee1ccc6eb8f79b866863b87 new file mode 100644 index 0000000..5f61174 Binary files /dev/null and b/test/data/testrepo.git/objects/f5/e5aa4e36ab0fe62ee1ccc6eb8f79b866863b87 differ diff --git a/test/data/testrepo.git/refs/heads/master b/test/data/testrepo.git/refs/heads/master index b8e9848..436950f 100644 --- a/test/data/testrepo.git/refs/heads/master +++ b/test/data/testrepo.git/refs/heads/master @@ -1 +1 @@ -056e626e51b1fc1ee2182800e399ed8d84c8f082 +784855caf26449a1914d2cf62d12b9374d76ae78 diff --git a/test/test_diff.py b/test/test_diff.py index 9b3b3d2..e67f321 100644 --- a/test/test_diff.py +++ b/test/test_diff.py @@ -41,6 +41,9 @@ COMMIT_SHA1_2 = 'c2792cfa289ae6321ecf2cd5806c2194b0fd070c' COMMIT_SHA1_3 = '2cdae28389c059815e951d0bb9eed6533f61a46b' COMMIT_SHA1_4 = 'ccca47fbb26183e71a7a46d165299b84e2e6c0b3' COMMIT_SHA1_5 = '056e626e51b1fc1ee2182800e399ed8d84c8f082' +COMMIT_SHA1_6 = 'f5e5aa4e36ab0fe62ee1ccc6eb8f79b866863b87' +COMMIT_SHA1_7 = '784855caf26449a1914d2cf62d12b9374d76ae78' + PATCH = """diff --git a/a b/a index 7f129fd..af431f2 100644 @@ -210,15 +213,15 @@ class DiffTest(utils.BareRepoTestCase): 'af431f20fc541ed6d5afede3e2dc7160f6f01f16') def test_find_similar(self): - commit_a = self.repo[COMMIT_SHA1_4] - commit_b = self.repo[COMMIT_SHA1_5] + commit_a = self.repo[COMMIT_SHA1_6] + commit_b = self.repo[COMMIT_SHA1_7] #~ Must pass GIT_DIFF_INCLUDE_UNMODIFIED if you expect to emulate #~ --find-copies-harder during rename transformion... diff = commit_a.tree.diff(commit_b.tree, GIT_DIFF_INCLUDE_UNMODIFIED) - self.assertFalse(('a', 'a.copy', 5, 100) in diff[0].files) - diff.find_similar(pygit2.GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED) - self.assertAny(lambda x:('a', 'a.copy', 5, 100) in x.files, diff) + self.assertFalse(('lorem', 'ipsum', 4, 100) in diff[0].files) + diff.find_similar() + self.assertAny(lambda x: ('lorem', 'ipsum', 4, 100) in x.files, diff) if __name__ == '__main__': unittest.main() diff --git a/test/test_remote.py b/test/test_remote.py index aacdc10..9b2c8c8 100644 --- a/test/test_remote.py +++ b/test/test_remote.py @@ -35,8 +35,8 @@ REMOTE_NAME = 'origin' REMOTE_URL = 'git://github.com/libgit2/pygit2.git' REMOTE_FETCHSPEC_SRC = 'refs/heads/*' REMOTE_FETCHSPEC_DST = 'refs/remotes/origin/*' -REMOTE_REPO_OBJECTS = 19 -REMOTE_REPO_BYTES = 1586 +REMOTE_REPO_OBJECTS = 24 +REMOTE_REPO_BYTES = 2253 class RepositoryTest(utils.RepoTestCase): def test_remote_create(self): diff --git a/test/test_repository.py b/test/test_repository.py index 105d1c5..c3457c4 100644 --- a/test/test_repository.py +++ b/test/test_repository.py @@ -42,8 +42,8 @@ import pygit2 from . import utils -HEAD_SHA = '056e626e51b1fc1ee2182800e399ed8d84c8f082' -PARENT_SHA = 'ccca47fbb26183e71a7a46d165299b84e2e6c0b3' # HEAD^ +HEAD_SHA = '784855caf26449a1914d2cf62d12b9374d76ae78' +PARENT_SHA = 'f5e5aa4e36ab0fe62ee1ccc6eb8f79b866863b87' # HEAD^ A_HEX_SHA = 'af431f20fc541ed6d5afede3e2dc7160f6f01f16' A_BIN_SHA = binascii.unhexlify(A_HEX_SHA.encode('ascii'))