From c1738f5fe1cfa94187835cee4ff375e53001657f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Tue, 12 Jul 2022 19:28:44 +0100 Subject: [PATCH] Move testdata out of code directory. --- dulwich/tests/test_index.py | 2 +- dulwich/tests/test_objects.py | 4 ++-- dulwich/tests/test_pack.py | 2 +- dulwich/tests/test_repository.py | 2 +- dulwich/tests/utils.py | 2 +- .../blobs/11/11111111111111111111111111111111111111 | Bin .../blobs/6f/670c0fb53f9463760b7295fbb814e965fb20c8 | Bin .../blobs/95/4a536f7819d40e6f637f849ee187dd10066349 | Bin .../blobs/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin .../0d/89f20333fbb1d2f3a94da77f4981373d8f4310 | 0 .../5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc | Bin .../60/dacdc733de308bb77bb76ce0fb0f9b44c9769e | 0 {dulwich/tests/data => testdata}/indexes/index | Bin ...ack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.idx | Bin ...ck-bc63ddad95e7321ee734ea11a7a62d314e0d7481.pack | Bin .../tests/data => testdata}/repos/.gitattributes | 0 {dulwich/tests/data => testdata}/repos/a.git/HEAD | 0 .../28/237f4dc30d0d462658d6b937b08a0f0b6ef55a | 0 .../2a/72d929692c41d8554c07f6301757ba18a65d91 | Bin .../4e/f30bbfe26431a69c3820d3a683df54d688f2ec | Bin .../4f/2e6529203aa6d44b5af6e3292c837ceda003f9 | Bin .../7d/9a07d797595ef11344549b8d08198e48c15364 | Bin .../a2/96d0bb611188cabb256919f36bc30117cca005 | Bin .../a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 | Bin .../b0/931cadc54336e78a1d980420e3268903b57a50 | 0 .../ff/d47d45845a8f6576491e1edb97e3fe6a850e7f | Bin .../tests/data => testdata}/repos/a.git/packed-refs | 0 .../data => testdata}/repos/a.git/refs/heads/master | 0 .../data => testdata}/repos/a.git/refs/tags/mytag | 0 .../tests/data => testdata}/repos/empty.git/HEAD | 0 .../tests/data => testdata}/repos/empty.git/config | 0 .../repos/empty.git/objects/info/.gitignore | 0 .../repos/empty.git/objects/pack/.gitignore | 0 .../repos/empty.git/refs/heads/.gitignore | 0 .../repos/empty.git/refs/tags/.gitignore | 0 .../repos/issue88_expect_ack_nak_client.export | 0 .../repos/issue88_expect_ack_nak_other.export | 0 .../repos/issue88_expect_ack_nak_server.export | 0 .../data => testdata}/repos/ooo_merge.git/HEAD | 0 .../29/69be3e8ee1c0222396a5611407e4769f14e54b | Bin .../38/74e9c60a6d149c44c928140f250d81e6381520 | Bin .../6f/670c0fb53f9463760b7295fbb814e965fb20c8 | Bin .../70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 | Bin .../76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1 | 0 .../90/182552c4a85a45ec2a835cadc3451bebdfe870 | Bin .../95/4a536f7819d40e6f637f849ee187dd10066349 | Bin .../b2/a2766a2879c209ab1176e7e778b81ae422eeaa | Bin .../f5/07291b64138b875c28e03469025b1ea20bc614 | Bin .../f9/e39b120c68182a4ba35349f832d0e4e61f485c | 0 .../fb/5b0425c7ce46959bec94d54b9a157645e114f5 | Bin .../repos/ooo_merge.git/refs/heads/master | 0 .../tests/data => testdata}/repos/refs.git/HEAD | 0 .../3b/9e5457140e738c2dcd39bf6d7acf88379b90d1 | Bin .../3e/c9c43c84ff242e3ef4a9fc5bc111fd780a76a8 | 0 .../42/d06bd4b77fed026b154d16493e5deab78f02ec | Bin .../a1/8114c31713746a33a2e70d9914d1ef3e781425 | Bin .../cd/a609072918d7b70057b6bef9f4c2537843fcfe | 0 .../df/6800012397fb85c56e7418dd4eb9405dee075c | Bin .../data => testdata}/repos/refs.git/packed-refs | 0 .../refs/heads/40-char-ref-aaaaaaaaaaaaaaaaaa | 0 .../repos/refs.git/refs/heads/loop | 0 .../repos/refs.git/refs/heads/master | 0 .../repos/refs.git/refs/tags/refs-0.2 | 0 .../tests/data => testdata}/repos/server_new.export | 0 .../tests/data => testdata}/repos/server_old.export | 0 .../data => testdata}/repos/simple_merge.git/HEAD | 0 .../0d/89f20333fbb1d2f3a94da77f4981373d8f4310 | 0 .../1b/6318f651a534b38f9c7aedeebbd56c1e896853 | Bin .../29/69be3e8ee1c0222396a5611407e4769f14e54b | Bin .../4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6 | 0 .../5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc | Bin .../60/dacdc733de308bb77bb76ce0fb0f9b44c9769e | 0 .../6f/670c0fb53f9463760b7295fbb814e965fb20c8 | Bin .../70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 | Bin .../90/182552c4a85a45ec2a835cadc3451bebdfe870 | Bin .../95/4a536f7819d40e6f637f849ee187dd10066349 | Bin .../ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd | 0 .../d4/bdad6549dfedf25d3b89d21f506aff575b28a7 | Bin .../d8/0c186a03f423a81b39df39dc87fd269736ca86 | Bin .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin .../repos/simple_merge.git/refs/heads/master | 0 .../tests/data => testdata}/repos/submodule/dotgit | 0 .../tags/71/033db03a03c6a36721efcf1968dd8f8e0cf023 | 0 .../trees/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 | Bin 84 files changed, 6 insertions(+), 6 deletions(-) rename {dulwich/tests/data => testdata}/blobs/11/11111111111111111111111111111111111111 (100%) rename {dulwich/tests/data => testdata}/blobs/6f/670c0fb53f9463760b7295fbb814e965fb20c8 (100%) rename {dulwich/tests/data => testdata}/blobs/95/4a536f7819d40e6f637f849ee187dd10066349 (100%) rename {dulwich/tests/data => testdata}/blobs/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 (100%) rename {dulwich/tests/data => testdata}/commits/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 (100%) rename {dulwich/tests/data => testdata}/commits/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc (100%) rename {dulwich/tests/data => testdata}/commits/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e (100%) rename {dulwich/tests/data => testdata}/indexes/index (100%) rename {dulwich/tests/data => testdata}/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.idx (100%) rename {dulwich/tests/data => testdata}/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.pack (100%) rename {dulwich/tests/data => testdata}/repos/.gitattributes (100%) rename {dulwich/tests/data => testdata}/repos/a.git/HEAD (100%) rename {dulwich/tests/data => testdata}/repos/a.git/objects/28/237f4dc30d0d462658d6b937b08a0f0b6ef55a (100%) rename {dulwich/tests/data => testdata}/repos/a.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91 (100%) rename {dulwich/tests/data => testdata}/repos/a.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec (100%) rename {dulwich/tests/data => testdata}/repos/a.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9 (100%) rename {dulwich/tests/data => testdata}/repos/a.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364 (100%) rename {dulwich/tests/data => testdata}/repos/a.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005 (100%) rename {dulwich/tests/data => testdata}/repos/a.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 (100%) rename {dulwich/tests/data => testdata}/repos/a.git/objects/b0/931cadc54336e78a1d980420e3268903b57a50 (100%) rename {dulwich/tests/data => testdata}/repos/a.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f (100%) rename {dulwich/tests/data => testdata}/repos/a.git/packed-refs (100%) rename {dulwich/tests/data => testdata}/repos/a.git/refs/heads/master (100%) rename {dulwich/tests/data => testdata}/repos/a.git/refs/tags/mytag (100%) rename {dulwich/tests/data => testdata}/repos/empty.git/HEAD (100%) rename {dulwich/tests/data => testdata}/repos/empty.git/config (100%) rename {dulwich/tests/data => testdata}/repos/empty.git/objects/info/.gitignore (100%) rename {dulwich/tests/data => testdata}/repos/empty.git/objects/pack/.gitignore (100%) rename {dulwich/tests/data => testdata}/repos/empty.git/refs/heads/.gitignore (100%) rename {dulwich/tests/data => testdata}/repos/empty.git/refs/tags/.gitignore (100%) rename {dulwich/tests/data => testdata}/repos/issue88_expect_ack_nak_client.export (100%) rename {dulwich/tests/data => testdata}/repos/issue88_expect_ack_nak_other.export (100%) rename {dulwich/tests/data => testdata}/repos/issue88_expect_ack_nak_server.export (100%) rename {dulwich/tests/data => testdata}/repos/ooo_merge.git/HEAD (100%) rename {dulwich/tests/data => testdata}/repos/ooo_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b (100%) rename {dulwich/tests/data => testdata}/repos/ooo_merge.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520 (100%) rename {dulwich/tests/data => testdata}/repos/ooo_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 (100%) rename {dulwich/tests/data => testdata}/repos/ooo_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 (100%) rename {dulwich/tests/data => testdata}/repos/ooo_merge.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1 (100%) rename {dulwich/tests/data => testdata}/repos/ooo_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 (100%) rename {dulwich/tests/data => testdata}/repos/ooo_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 (100%) rename {dulwich/tests/data => testdata}/repos/ooo_merge.git/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa (100%) rename {dulwich/tests/data => testdata}/repos/ooo_merge.git/objects/f5/07291b64138b875c28e03469025b1ea20bc614 (100%) rename {dulwich/tests/data => testdata}/repos/ooo_merge.git/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c (100%) rename {dulwich/tests/data => testdata}/repos/ooo_merge.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5 (100%) rename {dulwich/tests/data => testdata}/repos/ooo_merge.git/refs/heads/master (100%) rename {dulwich/tests/data => testdata}/repos/refs.git/HEAD (100%) rename {dulwich/tests/data => testdata}/repos/refs.git/objects/3b/9e5457140e738c2dcd39bf6d7acf88379b90d1 (100%) rename {dulwich/tests/data => testdata}/repos/refs.git/objects/3e/c9c43c84ff242e3ef4a9fc5bc111fd780a76a8 (100%) rename {dulwich/tests/data => testdata}/repos/refs.git/objects/42/d06bd4b77fed026b154d16493e5deab78f02ec (100%) rename {dulwich/tests/data => testdata}/repos/refs.git/objects/a1/8114c31713746a33a2e70d9914d1ef3e781425 (100%) rename {dulwich/tests/data => testdata}/repos/refs.git/objects/cd/a609072918d7b70057b6bef9f4c2537843fcfe (100%) rename {dulwich/tests/data => testdata}/repos/refs.git/objects/df/6800012397fb85c56e7418dd4eb9405dee075c (100%) rename {dulwich/tests/data => testdata}/repos/refs.git/packed-refs (100%) rename {dulwich/tests/data => testdata}/repos/refs.git/refs/heads/40-char-ref-aaaaaaaaaaaaaaaaaa (100%) rename {dulwich/tests/data => testdata}/repos/refs.git/refs/heads/loop (100%) rename {dulwich/tests/data => testdata}/repos/refs.git/refs/heads/master (100%) rename {dulwich/tests/data => testdata}/repos/refs.git/refs/tags/refs-0.2 (100%) rename {dulwich/tests/data => testdata}/repos/server_new.export (100%) rename {dulwich/tests/data => testdata}/repos/server_old.export (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/HEAD (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853 (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6 (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7 (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86 (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 (100%) rename {dulwich/tests/data => testdata}/repos/simple_merge.git/refs/heads/master (100%) rename {dulwich/tests/data => testdata}/repos/submodule/dotgit (100%) rename {dulwich/tests/data => testdata}/tags/71/033db03a03c6a36721efcf1968dd8f8e0cf023 (100%) rename {dulwich/tests/data => testdata}/trees/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 (100%) diff --git a/dulwich/tests/test_index.py b/dulwich/tests/test_index.py index aa6731815..7d3a784c2 100644 --- a/dulwich/tests/test_index.py +++ b/dulwich/tests/test_index.py @@ -86,7 +86,7 @@ def can_symlink(): class IndexTestCase(TestCase): - datadir = os.path.join(os.path.dirname(__file__), "data/indexes") + datadir = os.path.join(os.path.dirname(__file__), "../../testdata/indexes") def get_simple_index(self, name): return Index(os.path.join(self.datadir, name)) diff --git a/dulwich/tests/test_objects.py b/dulwich/tests/test_objects.py index 7c8256d34..d7ead9525 100644 --- a/dulwich/tests/test_objects.py +++ b/dulwich/tests/test_objects.py @@ -87,7 +87,7 @@ class BlobReadTests(TestCase): """Test decompression of blobs""" def get_sha_file(self, cls, base, sha): - dir = os.path.join(os.path.dirname(__file__), "data", base) + dir = os.path.join(os.path.dirname(__file__), "..", "..", "testdata", base) return cls.from_path(hex_to_filename(dir, sha)) def get_blob(self, sha): @@ -878,7 +878,7 @@ def test_tree_items_dir_sort(self): self.assertEqual(_SORTED_TREE_ITEMS, x.items()) def _do_test_parse_tree(self, parse_tree): - dir = os.path.join(os.path.dirname(__file__), "data", "trees") + dir = os.path.join(os.path.dirname(__file__), "..", "..", "testdata", "trees") o = Tree.from_path(hex_to_filename(dir, tree_sha)) self.assertEqual( [(b"a", 0o100644, a_sha), (b"b", 0o100644, b_sha)], diff --git a/dulwich/tests/test_pack.py b/dulwich/tests/test_pack.py index d8708c906..a5bb9cbf0 100644 --- a/dulwich/tests/test_pack.py +++ b/dulwich/tests/test_pack.py @@ -95,7 +95,7 @@ def setUp(self): self.tempdir = tempfile.mkdtemp() self.addCleanup(shutil.rmtree, self.tempdir) - datadir = os.path.abspath(os.path.join(os.path.dirname(__file__), "data/packs")) + datadir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../testdata/packs")) def get_pack_index(self, sha): """Returns a PackIndex from the datadir with the given sha""" diff --git a/dulwich/tests/test_repository.py b/dulwich/tests/test_repository.py index f22f5e416..1d07c0d1c 100644 --- a/dulwich/tests/test_repository.py +++ b/dulwich/tests/test_repository.py @@ -409,7 +409,7 @@ def test_clone(self): def test_clone_no_head(self): temp_dir = self.mkdtemp() self.addCleanup(shutil.rmtree, temp_dir) - repo_dir = os.path.join(os.path.dirname(__file__), "data", "repos") + repo_dir = os.path.join(os.path.dirname(__file__), "..", "..", "testdata", "repos") dest_dir = os.path.join(temp_dir, "a.git") shutil.copytree(os.path.join(repo_dir, "a.git"), dest_dir, symlinks=True) r = Repo(dest_dir) diff --git a/dulwich/tests/utils.py b/dulwich/tests/utils.py index 09f92cb38..f6b9d592a 100644 --- a/dulwich/tests/utils.py +++ b/dulwich/tests/utils.py @@ -76,7 +76,7 @@ def open_repo(name, temp_dir=None): """ if temp_dir is None: temp_dir = tempfile.mkdtemp() - repo_dir = os.path.join(os.path.dirname(__file__), "data", "repos", name) + repo_dir = os.path.join(os.path.dirname(__file__), "..", "..", "testdata", "repos", name) temp_repo_dir = os.path.join(temp_dir, name) shutil.copytree(repo_dir, temp_repo_dir, symlinks=True) return Repo(temp_repo_dir) diff --git a/dulwich/tests/data/blobs/11/11111111111111111111111111111111111111 b/testdata/blobs/11/11111111111111111111111111111111111111 similarity index 100% rename from dulwich/tests/data/blobs/11/11111111111111111111111111111111111111 rename to testdata/blobs/11/11111111111111111111111111111111111111 diff --git a/dulwich/tests/data/blobs/6f/670c0fb53f9463760b7295fbb814e965fb20c8 b/testdata/blobs/6f/670c0fb53f9463760b7295fbb814e965fb20c8 similarity index 100% rename from dulwich/tests/data/blobs/6f/670c0fb53f9463760b7295fbb814e965fb20c8 rename to testdata/blobs/6f/670c0fb53f9463760b7295fbb814e965fb20c8 diff --git a/dulwich/tests/data/blobs/95/4a536f7819d40e6f637f849ee187dd10066349 b/testdata/blobs/95/4a536f7819d40e6f637f849ee187dd10066349 similarity index 100% rename from dulwich/tests/data/blobs/95/4a536f7819d40e6f637f849ee187dd10066349 rename to testdata/blobs/95/4a536f7819d40e6f637f849ee187dd10066349 diff --git a/dulwich/tests/data/blobs/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/testdata/blobs/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 similarity index 100% rename from dulwich/tests/data/blobs/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 rename to testdata/blobs/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/dulwich/tests/data/commits/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 b/testdata/commits/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 similarity index 100% rename from dulwich/tests/data/commits/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 rename to testdata/commits/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 diff --git a/dulwich/tests/data/commits/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc b/testdata/commits/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc similarity index 100% rename from dulwich/tests/data/commits/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc rename to testdata/commits/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc diff --git a/dulwich/tests/data/commits/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e b/testdata/commits/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e similarity index 100% rename from dulwich/tests/data/commits/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e rename to testdata/commits/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e diff --git a/dulwich/tests/data/indexes/index b/testdata/indexes/index similarity index 100% rename from dulwich/tests/data/indexes/index rename to testdata/indexes/index diff --git a/dulwich/tests/data/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.idx b/testdata/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.idx similarity index 100% rename from dulwich/tests/data/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.idx rename to testdata/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.idx diff --git a/dulwich/tests/data/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.pack b/testdata/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.pack similarity index 100% rename from dulwich/tests/data/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.pack rename to testdata/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.pack diff --git a/dulwich/tests/data/repos/.gitattributes b/testdata/repos/.gitattributes similarity index 100% rename from dulwich/tests/data/repos/.gitattributes rename to testdata/repos/.gitattributes diff --git a/dulwich/tests/data/repos/a.git/HEAD b/testdata/repos/a.git/HEAD similarity index 100% rename from dulwich/tests/data/repos/a.git/HEAD rename to testdata/repos/a.git/HEAD diff --git a/dulwich/tests/data/repos/a.git/objects/28/237f4dc30d0d462658d6b937b08a0f0b6ef55a b/testdata/repos/a.git/objects/28/237f4dc30d0d462658d6b937b08a0f0b6ef55a similarity index 100% rename from dulwich/tests/data/repos/a.git/objects/28/237f4dc30d0d462658d6b937b08a0f0b6ef55a rename to testdata/repos/a.git/objects/28/237f4dc30d0d462658d6b937b08a0f0b6ef55a diff --git a/dulwich/tests/data/repos/a.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91 b/testdata/repos/a.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91 similarity index 100% rename from dulwich/tests/data/repos/a.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91 rename to testdata/repos/a.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91 diff --git a/dulwich/tests/data/repos/a.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec b/testdata/repos/a.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec similarity index 100% rename from dulwich/tests/data/repos/a.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec rename to testdata/repos/a.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec diff --git a/dulwich/tests/data/repos/a.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9 b/testdata/repos/a.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9 similarity index 100% rename from dulwich/tests/data/repos/a.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9 rename to testdata/repos/a.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9 diff --git a/dulwich/tests/data/repos/a.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364 b/testdata/repos/a.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364 similarity index 100% rename from dulwich/tests/data/repos/a.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364 rename to testdata/repos/a.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364 diff --git a/dulwich/tests/data/repos/a.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005 b/testdata/repos/a.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005 similarity index 100% rename from dulwich/tests/data/repos/a.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005 rename to testdata/repos/a.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005 diff --git a/dulwich/tests/data/repos/a.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 b/testdata/repos/a.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 similarity index 100% rename from dulwich/tests/data/repos/a.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 rename to testdata/repos/a.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 diff --git a/dulwich/tests/data/repos/a.git/objects/b0/931cadc54336e78a1d980420e3268903b57a50 b/testdata/repos/a.git/objects/b0/931cadc54336e78a1d980420e3268903b57a50 similarity index 100% rename from dulwich/tests/data/repos/a.git/objects/b0/931cadc54336e78a1d980420e3268903b57a50 rename to testdata/repos/a.git/objects/b0/931cadc54336e78a1d980420e3268903b57a50 diff --git a/dulwich/tests/data/repos/a.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f b/testdata/repos/a.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f similarity index 100% rename from dulwich/tests/data/repos/a.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f rename to testdata/repos/a.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f diff --git a/dulwich/tests/data/repos/a.git/packed-refs b/testdata/repos/a.git/packed-refs similarity index 100% rename from dulwich/tests/data/repos/a.git/packed-refs rename to testdata/repos/a.git/packed-refs diff --git a/dulwich/tests/data/repos/a.git/refs/heads/master b/testdata/repos/a.git/refs/heads/master similarity index 100% rename from dulwich/tests/data/repos/a.git/refs/heads/master rename to testdata/repos/a.git/refs/heads/master diff --git a/dulwich/tests/data/repos/a.git/refs/tags/mytag b/testdata/repos/a.git/refs/tags/mytag similarity index 100% rename from dulwich/tests/data/repos/a.git/refs/tags/mytag rename to testdata/repos/a.git/refs/tags/mytag diff --git a/dulwich/tests/data/repos/empty.git/HEAD b/testdata/repos/empty.git/HEAD similarity index 100% rename from dulwich/tests/data/repos/empty.git/HEAD rename to testdata/repos/empty.git/HEAD diff --git a/dulwich/tests/data/repos/empty.git/config b/testdata/repos/empty.git/config similarity index 100% rename from dulwich/tests/data/repos/empty.git/config rename to testdata/repos/empty.git/config diff --git a/dulwich/tests/data/repos/empty.git/objects/info/.gitignore b/testdata/repos/empty.git/objects/info/.gitignore similarity index 100% rename from dulwich/tests/data/repos/empty.git/objects/info/.gitignore rename to testdata/repos/empty.git/objects/info/.gitignore diff --git a/dulwich/tests/data/repos/empty.git/objects/pack/.gitignore b/testdata/repos/empty.git/objects/pack/.gitignore similarity index 100% rename from dulwich/tests/data/repos/empty.git/objects/pack/.gitignore rename to testdata/repos/empty.git/objects/pack/.gitignore diff --git a/dulwich/tests/data/repos/empty.git/refs/heads/.gitignore b/testdata/repos/empty.git/refs/heads/.gitignore similarity index 100% rename from dulwich/tests/data/repos/empty.git/refs/heads/.gitignore rename to testdata/repos/empty.git/refs/heads/.gitignore diff --git a/dulwich/tests/data/repos/empty.git/refs/tags/.gitignore b/testdata/repos/empty.git/refs/tags/.gitignore similarity index 100% rename from dulwich/tests/data/repos/empty.git/refs/tags/.gitignore rename to testdata/repos/empty.git/refs/tags/.gitignore diff --git a/dulwich/tests/data/repos/issue88_expect_ack_nak_client.export b/testdata/repos/issue88_expect_ack_nak_client.export similarity index 100% rename from dulwich/tests/data/repos/issue88_expect_ack_nak_client.export rename to testdata/repos/issue88_expect_ack_nak_client.export diff --git a/dulwich/tests/data/repos/issue88_expect_ack_nak_other.export b/testdata/repos/issue88_expect_ack_nak_other.export similarity index 100% rename from dulwich/tests/data/repos/issue88_expect_ack_nak_other.export rename to testdata/repos/issue88_expect_ack_nak_other.export diff --git a/dulwich/tests/data/repos/issue88_expect_ack_nak_server.export b/testdata/repos/issue88_expect_ack_nak_server.export similarity index 100% rename from dulwich/tests/data/repos/issue88_expect_ack_nak_server.export rename to testdata/repos/issue88_expect_ack_nak_server.export diff --git a/dulwich/tests/data/repos/ooo_merge.git/HEAD b/testdata/repos/ooo_merge.git/HEAD similarity index 100% rename from dulwich/tests/data/repos/ooo_merge.git/HEAD rename to testdata/repos/ooo_merge.git/HEAD diff --git a/dulwich/tests/data/repos/ooo_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b b/testdata/repos/ooo_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b similarity index 100% rename from dulwich/tests/data/repos/ooo_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b rename to testdata/repos/ooo_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b diff --git a/dulwich/tests/data/repos/ooo_merge.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520 b/testdata/repos/ooo_merge.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520 similarity index 100% rename from dulwich/tests/data/repos/ooo_merge.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520 rename to testdata/repos/ooo_merge.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520 diff --git a/dulwich/tests/data/repos/ooo_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 b/testdata/repos/ooo_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 similarity index 100% rename from dulwich/tests/data/repos/ooo_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 rename to testdata/repos/ooo_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 diff --git a/dulwich/tests/data/repos/ooo_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 b/testdata/repos/ooo_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 similarity index 100% rename from dulwich/tests/data/repos/ooo_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 rename to testdata/repos/ooo_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 diff --git a/dulwich/tests/data/repos/ooo_merge.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1 b/testdata/repos/ooo_merge.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1 similarity index 100% rename from dulwich/tests/data/repos/ooo_merge.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1 rename to testdata/repos/ooo_merge.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1 diff --git a/dulwich/tests/data/repos/ooo_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 b/testdata/repos/ooo_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 similarity index 100% rename from dulwich/tests/data/repos/ooo_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 rename to testdata/repos/ooo_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 diff --git a/dulwich/tests/data/repos/ooo_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 b/testdata/repos/ooo_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 similarity index 100% rename from dulwich/tests/data/repos/ooo_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 rename to testdata/repos/ooo_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 diff --git a/dulwich/tests/data/repos/ooo_merge.git/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa b/testdata/repos/ooo_merge.git/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa similarity index 100% rename from dulwich/tests/data/repos/ooo_merge.git/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa rename to testdata/repos/ooo_merge.git/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa diff --git a/dulwich/tests/data/repos/ooo_merge.git/objects/f5/07291b64138b875c28e03469025b1ea20bc614 b/testdata/repos/ooo_merge.git/objects/f5/07291b64138b875c28e03469025b1ea20bc614 similarity index 100% rename from dulwich/tests/data/repos/ooo_merge.git/objects/f5/07291b64138b875c28e03469025b1ea20bc614 rename to testdata/repos/ooo_merge.git/objects/f5/07291b64138b875c28e03469025b1ea20bc614 diff --git a/dulwich/tests/data/repos/ooo_merge.git/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c b/testdata/repos/ooo_merge.git/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c similarity index 100% rename from dulwich/tests/data/repos/ooo_merge.git/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c rename to testdata/repos/ooo_merge.git/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c diff --git a/dulwich/tests/data/repos/ooo_merge.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5 b/testdata/repos/ooo_merge.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5 similarity index 100% rename from dulwich/tests/data/repos/ooo_merge.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5 rename to testdata/repos/ooo_merge.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5 diff --git a/dulwich/tests/data/repos/ooo_merge.git/refs/heads/master b/testdata/repos/ooo_merge.git/refs/heads/master similarity index 100% rename from dulwich/tests/data/repos/ooo_merge.git/refs/heads/master rename to testdata/repos/ooo_merge.git/refs/heads/master diff --git a/dulwich/tests/data/repos/refs.git/HEAD b/testdata/repos/refs.git/HEAD similarity index 100% rename from dulwich/tests/data/repos/refs.git/HEAD rename to testdata/repos/refs.git/HEAD diff --git a/dulwich/tests/data/repos/refs.git/objects/3b/9e5457140e738c2dcd39bf6d7acf88379b90d1 b/testdata/repos/refs.git/objects/3b/9e5457140e738c2dcd39bf6d7acf88379b90d1 similarity index 100% rename from dulwich/tests/data/repos/refs.git/objects/3b/9e5457140e738c2dcd39bf6d7acf88379b90d1 rename to testdata/repos/refs.git/objects/3b/9e5457140e738c2dcd39bf6d7acf88379b90d1 diff --git a/dulwich/tests/data/repos/refs.git/objects/3e/c9c43c84ff242e3ef4a9fc5bc111fd780a76a8 b/testdata/repos/refs.git/objects/3e/c9c43c84ff242e3ef4a9fc5bc111fd780a76a8 similarity index 100% rename from dulwich/tests/data/repos/refs.git/objects/3e/c9c43c84ff242e3ef4a9fc5bc111fd780a76a8 rename to testdata/repos/refs.git/objects/3e/c9c43c84ff242e3ef4a9fc5bc111fd780a76a8 diff --git a/dulwich/tests/data/repos/refs.git/objects/42/d06bd4b77fed026b154d16493e5deab78f02ec b/testdata/repos/refs.git/objects/42/d06bd4b77fed026b154d16493e5deab78f02ec similarity index 100% rename from dulwich/tests/data/repos/refs.git/objects/42/d06bd4b77fed026b154d16493e5deab78f02ec rename to testdata/repos/refs.git/objects/42/d06bd4b77fed026b154d16493e5deab78f02ec diff --git a/dulwich/tests/data/repos/refs.git/objects/a1/8114c31713746a33a2e70d9914d1ef3e781425 b/testdata/repos/refs.git/objects/a1/8114c31713746a33a2e70d9914d1ef3e781425 similarity index 100% rename from dulwich/tests/data/repos/refs.git/objects/a1/8114c31713746a33a2e70d9914d1ef3e781425 rename to testdata/repos/refs.git/objects/a1/8114c31713746a33a2e70d9914d1ef3e781425 diff --git a/dulwich/tests/data/repos/refs.git/objects/cd/a609072918d7b70057b6bef9f4c2537843fcfe b/testdata/repos/refs.git/objects/cd/a609072918d7b70057b6bef9f4c2537843fcfe similarity index 100% rename from dulwich/tests/data/repos/refs.git/objects/cd/a609072918d7b70057b6bef9f4c2537843fcfe rename to testdata/repos/refs.git/objects/cd/a609072918d7b70057b6bef9f4c2537843fcfe diff --git a/dulwich/tests/data/repos/refs.git/objects/df/6800012397fb85c56e7418dd4eb9405dee075c b/testdata/repos/refs.git/objects/df/6800012397fb85c56e7418dd4eb9405dee075c similarity index 100% rename from dulwich/tests/data/repos/refs.git/objects/df/6800012397fb85c56e7418dd4eb9405dee075c rename to testdata/repos/refs.git/objects/df/6800012397fb85c56e7418dd4eb9405dee075c diff --git a/dulwich/tests/data/repos/refs.git/packed-refs b/testdata/repos/refs.git/packed-refs similarity index 100% rename from dulwich/tests/data/repos/refs.git/packed-refs rename to testdata/repos/refs.git/packed-refs diff --git a/dulwich/tests/data/repos/refs.git/refs/heads/40-char-ref-aaaaaaaaaaaaaaaaaa b/testdata/repos/refs.git/refs/heads/40-char-ref-aaaaaaaaaaaaaaaaaa similarity index 100% rename from dulwich/tests/data/repos/refs.git/refs/heads/40-char-ref-aaaaaaaaaaaaaaaaaa rename to testdata/repos/refs.git/refs/heads/40-char-ref-aaaaaaaaaaaaaaaaaa diff --git a/dulwich/tests/data/repos/refs.git/refs/heads/loop b/testdata/repos/refs.git/refs/heads/loop similarity index 100% rename from dulwich/tests/data/repos/refs.git/refs/heads/loop rename to testdata/repos/refs.git/refs/heads/loop diff --git a/dulwich/tests/data/repos/refs.git/refs/heads/master b/testdata/repos/refs.git/refs/heads/master similarity index 100% rename from dulwich/tests/data/repos/refs.git/refs/heads/master rename to testdata/repos/refs.git/refs/heads/master diff --git a/dulwich/tests/data/repos/refs.git/refs/tags/refs-0.2 b/testdata/repos/refs.git/refs/tags/refs-0.2 similarity index 100% rename from dulwich/tests/data/repos/refs.git/refs/tags/refs-0.2 rename to testdata/repos/refs.git/refs/tags/refs-0.2 diff --git a/dulwich/tests/data/repos/server_new.export b/testdata/repos/server_new.export similarity index 100% rename from dulwich/tests/data/repos/server_new.export rename to testdata/repos/server_new.export diff --git a/dulwich/tests/data/repos/server_old.export b/testdata/repos/server_old.export similarity index 100% rename from dulwich/tests/data/repos/server_old.export rename to testdata/repos/server_old.export diff --git a/dulwich/tests/data/repos/simple_merge.git/HEAD b/testdata/repos/simple_merge.git/HEAD similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/HEAD rename to testdata/repos/simple_merge.git/HEAD diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 b/testdata/repos/simple_merge.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 rename to testdata/repos/simple_merge.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853 b/testdata/repos/simple_merge.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853 similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853 rename to testdata/repos/simple_merge.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853 diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b b/testdata/repos/simple_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b rename to testdata/repos/simple_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6 b/testdata/repos/simple_merge.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6 similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6 rename to testdata/repos/simple_merge.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6 diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc b/testdata/repos/simple_merge.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc rename to testdata/repos/simple_merge.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e b/testdata/repos/simple_merge.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e rename to testdata/repos/simple_merge.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 b/testdata/repos/simple_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 rename to testdata/repos/simple_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 b/testdata/repos/simple_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 rename to testdata/repos/simple_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 b/testdata/repos/simple_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 rename to testdata/repos/simple_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 b/testdata/repos/simple_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 rename to testdata/repos/simple_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd b/testdata/repos/simple_merge.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd rename to testdata/repos/simple_merge.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7 b/testdata/repos/simple_merge.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7 similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7 rename to testdata/repos/simple_merge.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7 diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86 b/testdata/repos/simple_merge.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86 similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86 rename to testdata/repos/simple_merge.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86 diff --git a/dulwich/tests/data/repos/simple_merge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/testdata/repos/simple_merge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 rename to testdata/repos/simple_merge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/dulwich/tests/data/repos/simple_merge.git/refs/heads/master b/testdata/repos/simple_merge.git/refs/heads/master similarity index 100% rename from dulwich/tests/data/repos/simple_merge.git/refs/heads/master rename to testdata/repos/simple_merge.git/refs/heads/master diff --git a/dulwich/tests/data/repos/submodule/dotgit b/testdata/repos/submodule/dotgit similarity index 100% rename from dulwich/tests/data/repos/submodule/dotgit rename to testdata/repos/submodule/dotgit diff --git a/dulwich/tests/data/tags/71/033db03a03c6a36721efcf1968dd8f8e0cf023 b/testdata/tags/71/033db03a03c6a36721efcf1968dd8f8e0cf023 similarity index 100% rename from dulwich/tests/data/tags/71/033db03a03c6a36721efcf1968dd8f8e0cf023 rename to testdata/tags/71/033db03a03c6a36721efcf1968dd8f8e0cf023 diff --git a/dulwich/tests/data/trees/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 b/testdata/trees/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 similarity index 100% rename from dulwich/tests/data/trees/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 rename to testdata/trees/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6