Move tests to root. Fixes #1024

.github/workflows/python-distributions.yml

@@ -30,7 +30,7 @@ jobs:
         run: pip install -U gpg
         if: "matrix.os != 'windows-latest'"
       - name: Run test suite
-        run: python -m unittest dulwich.tests.test_suite
+        run: python -m unittest tests.test_suite
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         if: "matrix.os == 'ubuntu-latest'"

.github/workflows/pythontest.yml

@@ -54,4 +54,4 @@ jobs:
       - name: Coverage test suite run
         run: |
           pip install --upgrade coverage
-          python -m coverage run -p -m unittest dulwich.tests.test_suite
+          python -m coverage run -p -m unittest tests.test_suite

.stestr.conf

@@ -1,2 +1,2 @@
 [DEFAULT]
-test_path=dulwich/tests
+test_path=tests

.testr.conf

@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=PYTHONPATH=. python -m subunit.run $IDOPTION $LISTOPT dulwich.tests.test_suite
+test_command=PYTHONPATH=. python3 -m subunit.run $IDOPTION $LISTOPT tests.test_suite
 test_id_option=--load-list $IDFILE
 test_list_option=--list

Makefile

@@ -22,22 +22,22 @@ install::
 	$(SETUP) install --root="$(DESTDIR)"
 
 check:: build
-	$(RUNTEST) dulwich.tests.test_suite
+	$(RUNTEST) tests.test_suite
 
 check-tutorial:: build
-	$(RUNTEST) dulwich.tests.tutorial_test_suite
+	$(RUNTEST) tests.tutorial_test_suite
 
 check-nocompat:: build
-	$(RUNTEST) dulwich.tests.nocompat_test_suite
+	$(RUNTEST) tests.nocompat_test_suite
 
 check-compat:: build
-	$(RUNTEST) dulwich.tests.compat_test_suite
+	$(RUNTEST) tests.compat_test_suite
 
 check-pypy:: clean
 	$(MAKE) check-noextensions PYTHON=pypy
 
 check-noextensions:: clean
-	$(RUNTEST) dulwich.tests.test_suite
+	$(RUNTEST) tests.test_suite
 
 check-contrib:: clean
 	$(RUNTEST) -v dulwich.contrib.test_suite
@@ -55,7 +55,7 @@ style:
 	$(RUFF) check .
 
 coverage:
-	$(COVERAGE) run -m unittest dulwich.tests.test_suite dulwich.contrib.test_suite
+	$(COVERAGE) run -m unittest tests.test_suite dulwich.contrib.test_suite
 
 coverage-html: coverage
 	$(COVERAGE) html

NEWS

@@ -1,5 +1,7 @@
 0.21.8	UNRELEASED
 
+ * Move tests to root. (Jelmer Vernooij, #1024)
+
  * Convert the optional C implementations to Rust.
    (Jelmer Vernooij)
 

dulwich/contrib/README.swift.rst

@@ -56,7 +56,7 @@ How to start unittest
 There is no need to have a Swift cluster running to run the unitests.
 Just run the following command in the Dulwich source directory::
 
-    $ PYTHONPATH=. python -m dulwich.contrib.test_swift
+    $ PYTHONPATH=. python -m tests.contrib.test_swift
 
 How to start functional tests
 -----------------------------
@@ -65,7 +65,7 @@ We provide some basic tests to perform smoke tests against a real Swift
 cluster. To run those functional tests you need a properly configured
 configuration file. The tests can be run as follow::
 
-    $ DULWICH_SWIFT_CFG=/etc/swift-dul.conf PYTHONPATH=. python -m dulwich.contrib.test_swift_smoke
+    $ DULWICH_SWIFT_CFG=/etc/swift-dul.conf PYTHONPATH=. python -m tests.contrib.test_swift_smoke
 
 How to install
 --------------

dulwich/contrib/__init__.py

@@ -18,15 +18,3 @@
 # License, Version 2.0.
 #
 
-
-def test_suite():
-    import unittest
-
-    names = [
-        "paramiko_vendor",
-        "release_robot",
-        "swift",
-    ]
-    module_names = ["dulwich.contrib.test_" + name for name in names]
-    loader = unittest.TestLoader()
-    return loader.loadTestsFromNames(module_names)

pyproject.toml

@@ -54,8 +54,6 @@ ignore_missing_imports = true
 packages = [
     "dulwich",
     "dulwich.cloud",
-    "dulwich.tests",
-    "dulwich.tests.compat",
     "dulwich.contrib",
 ]
 include-package-data = true

dulwich/tests/__init__.py → tests/__init__.py

@@ -150,7 +150,7 @@ def self_test_suite():
         "walk",
         "web",
     ]
-    module_names = ["dulwich.tests.test_" + name for name in names]
+    module_names = ["tests.test_" + name for name in names]
     loader = unittest.TestLoader()
     return loader.loadTestsFromNames(module_names)
 
@@ -164,7 +164,7 @@ def tutorial_test_suite():
         "remote",
         "conclusion",
     ]
-    tutorial_files = [f"../../docs/tutorial/{name}.txt" for name in tutorial]
+    tutorial_files = [f"../docs/tutorial/{name}.txt" for name in tutorial]
 
     to_restore = []
 
@@ -196,7 +196,7 @@ def tutorial_test_suite():
 
     return doctest.DocFileSuite(
         module_relative=True,
-        package="dulwich.tests",
+        package="tests",
         setUp=setup,
         tearDown=teardown,
         *tutorial_files,
@@ -215,7 +215,7 @@ def nocompat_test_suite():
 
 def compat_test_suite():
     result = unittest.TestSuite()
-    from dulwich.tests.compat import test_suite as compat_test_suite
+    from .compat import test_suite as compat_test_suite
 
     result.addTests(compat_test_suite())
     return result
@@ -226,10 +226,10 @@ def test_suite():
     result.addTests(self_test_suite())
     if sys.platform != "win32":
         result.addTests(tutorial_test_suite())
-    from dulwich.tests.compat import test_suite as compat_test_suite
+    from .compat import test_suite as compat_test_suite
 
     result.addTests(compat_test_suite())
-    from dulwich.contrib import test_suite as contrib_test_suite
+    from .contrib import test_suite as contrib_test_suite
 
     result.addTests(contrib_test_suite())
     return result

dulwich/tests/compat/__init__.py → tests/compat/__init__.py

@@ -34,7 +34,7 @@ def test_suite():
         "utils",
         "web",
     ]
-    module_names = ["dulwich.tests.compat.test_" + name for name in names]
+    module_names = ["tests.compat.test_" + name for name in names]
     result = unittest.TestSuite()
     loader = unittest.TestLoader()
     suite = loader.loadTestsFromNames(module_names)

dulwich/tests/compat/server_utils.py → tests/compat/server_utils.py

@@ -26,10 +26,11 @@ import shutil
 import socket
 import tempfile
 
-from ...objects import hex_to_sha
-from ...protocol import CAPABILITY_SIDE_BAND_64K
-from ...repo import Repo
-from ...server import ReceivePackHandler
+from dulwich.objects import hex_to_sha
+from dulwich.protocol import CAPABILITY_SIDE_BAND_64K
+from dulwich.repo import Repo
+from dulwich.server import ReceivePackHandler
+
 from ..utils import tear_down_repo
 from .utils import require_git_version, run_git_or_fail
 

dulwich/tests/compat/test_client.py → tests/compat/test_client.py

@@ -36,8 +36,8 @@ from io import BytesIO
 from urllib.parse import unquote
 
 from dulwich import client, file, index, objects, protocol, repo
-from dulwich.tests import SkipTest, expectedFailure
 
+from .. import SkipTest, expectedFailure
 from .utils import (
     _DEFAULT_GIT,
     CompatTestCase,

dulwich/tests/compat/test_pack.py → tests/compat/test_pack.py

@@ -26,10 +26,10 @@ import re
 import shutil
 import tempfile
 
-from dulwich.tests import SkipTest
+from dulwich.objects import Blob
+from dulwich.pack import write_pack
 
-from ...objects import Blob
-from ...pack import write_pack
+from .. import SkipTest
 from ..test_pack import PackTests, a_sha, pack1_sha
 from .utils import require_git_version, run_git_or_fail
 

dulwich/tests/compat/test_patch.py → tests/compat/test_patch.py

@@ -26,8 +26,8 @@ import tempfile
 from io import BytesIO
 
 from dulwich import porcelain
+from dulwich.repo import Repo
 
-from ...repo import Repo
 from .utils import CompatTestCase, run_git_or_fail
 
 

dulwich/tests/compat/test_repository.py → tests/compat/test_repository.py

@@ -25,8 +25,9 @@ import tempfile
 from io import BytesIO
 from itertools import chain
 
-from ...objects import hex_to_sha
-from ...repo import Repo, check_ref_format
+from dulwich.objects import hex_to_sha
+from dulwich.repo import Repo, check_ref_format
+
 from .utils import CompatTestCase, require_git_version, rmtree_ro, run_git_or_fail
 
 

dulwich/tests/compat/test_server.py → tests/compat/test_server.py

@@ -29,9 +29,9 @@ import os
 import sys
 import threading
 
-from dulwich.tests import skipIf
+from dulwich.server import DictBackend, TCPGitServer
 
-from ...server import DictBackend, TCPGitServer
+from .. import skipIf
 from .server_utils import NoSideBand64kReceivePackHandler, ServerTests
 from .utils import CompatTestCase, require_git_version
 

dulwich/tests/compat/test_utils.py → tests/compat/test_utils.py

@@ -20,8 +20,8 @@
 
 """Tests for git compatibility utilities."""
 
-from dulwich.tests import SkipTest, TestCase
-from dulwich.tests.compat import utils
+from .. import SkipTest, TestCase
+from . import utils
 
 
 class GitVersionTests(TestCase):

dulwich/tests/compat/test_web.py → tests/compat/test_web.py

@@ -30,15 +30,15 @@ import threading
 from typing import Tuple
 from wsgiref import simple_server
 
-from dulwich.tests import SkipTest, skipIf
-
-from ...server import DictBackend, ReceivePackHandler, UploadPackHandler
-from ...web import (
+from dulwich.server import DictBackend, ReceivePackHandler, UploadPackHandler
+from dulwich.web import (
     HTTPGitApplication,
     WSGIRequestHandlerLogger,
     WSGIServerLogger,
     make_wsgi_chain,
 )
+
+from .. import SkipTest, skipIf
 from .server_utils import NoSideBand64kReceivePackHandler, ServerTests
 from .utils import CompatTestCase
 

dulwich/tests/compat/utils.py → tests/compat/utils.py

@@ -32,16 +32,16 @@ import tempfile
 import time
 from typing import Tuple
 
-from dulwich.tests import SkipTest, TestCase
+from dulwich.protocol import TCP_GIT_PORT
+from dulwich.repo import Repo
 
-from ...protocol import TCP_GIT_PORT
-from ...repo import Repo
+from .. import SkipTest, TestCase
 
 _DEFAULT_GIT = "git"
 _VERSION_LEN = 4
 _REPOS_DATA_DIR = os.path.abspath(
     os.path.join(
-        os.path.dirname(__file__), os.pardir, os.pardir, os.pardir, "testdata", "repos"
+        os.path.dirname(__file__), os.pardir, os.pardir, "testdata", "repos"
     )
 )
 

tests/contrib/__init__.py

@@ -0,0 +1,31 @@
+# __init__.py -- Contrib module for Dulwich
+# Copyright (C) 2014 Jelmer Vernooij <jelmer@jelmer.uk>
+#
+# Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
+# General Public License as public by the Free Software Foundation; version 2.0
+# or (at your option) any later version. You can redistribute it and/or
+# modify it under the terms of either of these two licenses.
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# You should have received a copy of the licenses; if not, see
+# <http://www.gnu.org/licenses/> for a copy of the GNU General Public License
+# and <http://www.apache.org/licenses/LICENSE-2.0> for a copy of the Apache
+# License, Version 2.0.
+#
+
+def test_suite():
+    import unittest
+
+    names = [
+        "paramiko_vendor",
+        "release_robot",
+        "swift",
+    ]
+    module_names = ["tests.contrib.test_" + name for name in names]
+    loader = unittest.TestLoader()
+    return loader.loadTestsFromNames(module_names)

dulwich/contrib/test_paramiko_vendor.py → tests/contrib/test_paramiko_vendor.py

@@ -24,7 +24,7 @@ import threading
 from io import StringIO
 from unittest import skipIf
 
-from dulwich.tests import TestCase
+from .. import TestCase
 
 try:
     import paramiko
@@ -32,7 +32,7 @@ except ImportError:
     has_paramiko = False
 else:
     has_paramiko = True
-    from .paramiko_vendor import ParamikoSSHVendor
+    from dulwich.contrib.paramiko_vendor import ParamikoSSHVendor
 
     class Server(paramiko.ServerInterface):
         """http://docs.paramiko.org/en/2.4/api/server.html."""

dulwich/contrib/test_release_robot.py → tests/contrib/test_release_robot.py

@@ -29,9 +29,9 @@ import unittest
 from typing import ClassVar, Dict, List, Optional, Tuple
 
 from dulwich.contrib import release_robot
+from dulwich.repo import Repo
 
-from ..repo import Repo
-from ..tests.utils import make_commit, make_tag
+from ..utils import make_commit, make_tag
 
 BASEDIR = os.path.abspath(os.path.dirname(__file__))  # this directory
 

dulwich/contrib/test_swift.py → tests/contrib/test_swift.py

@@ -28,10 +28,10 @@ from io import BytesIO, StringIO
 from time import time
 from unittest import skipIf
 
-from dulwich.tests import TestCase
+from dulwich.objects import Blob, Commit, Tag, Tree, parse_timezone
 
-from ..objects import Blob, Commit, Tag, Tree, parse_timezone
-from ..tests.test_object_store import ObjectStoreTests
+from .. import TestCase
+from ..test_object_store import ObjectStoreTests
 
 missing_libs = []
 

dulwich/tests/test_archive.py → tests/test_archive.py

@@ -25,11 +25,11 @@ import tarfile
 from io import BytesIO
 from unittest import skipUnless
 
-from dulwich.tests import TestCase
+from dulwich.archive import tar_stream
+from dulwich.object_store import MemoryObjectStore
+from dulwich.objects import Blob, Tree
 
-from ..archive import tar_stream
-from ..object_store import MemoryObjectStore
-from ..objects import Blob, Tree
+from . import TestCase
 from .utils import build_commit_graph
 
 try:

dulwich/tests/test_blackbox.py → tests/test_blackbox.py

@@ -23,9 +23,9 @@
 import shutil
 import tempfile
 
-from dulwich.tests import BlackboxTestCase
+from dulwich.repo import Repo
 
-from ..repo import Repo
+from . import BlackboxTestCase
 
 
 class GitReceivePackTests(BlackboxTestCase):

dulwich/tests/test_bundle.py → tests/test_bundle.py

@@ -24,10 +24,10 @@ import os
 import tempfile
 from io import BytesIO
 
-from dulwich.tests import TestCase
+from dulwich.bundle import Bundle, read_bundle, write_bundle
+from dulwich.pack import PackData, write_pack_objects
 
-from ..bundle import Bundle, read_bundle, write_bundle
-from ..pack import PackData, write_pack_objects
+from . import TestCase
 
 
 class BundleTests(TestCase):

dulwich/tests/test_client.py → tests/test_client.py

@@ -32,9 +32,7 @@ from urllib.parse import urlparse
 
 import dulwich
 from dulwich import client
-from dulwich.tests import TestCase, skipIf
-
-from ..client import (
+from dulwich.client import (
     FetchPackResult,
     GitProtocolError,
     HangupException,
@@ -57,11 +55,13 @@ from ..client import (
     get_transport_and_path_from_url,
     parse_rsync_url,
 )
-from ..config import ConfigDict
-from ..objects import Commit, Tree
-from ..pack import pack_objects_to_data, write_pack_data, write_pack_objects
-from ..protocol import TCP_GIT_PORT, Protocol
-from ..repo import MemoryRepo, Repo
+from dulwich.config import ConfigDict
+from dulwich.objects import Commit, Tree
+from dulwich.pack import pack_objects_to_data, write_pack_data, write_pack_objects
+from dulwich.protocol import TCP_GIT_PORT, Protocol
+from dulwich.repo import MemoryRepo, Repo
+
+from . import TestCase, skipIf
 from .utils import open_repo, setup_warning_catcher, tear_down_repo
 
 

dulwich/tests/test_config.py → tests/test_config.py

@@ -26,9 +26,7 @@ from io import BytesIO
 from unittest import skipIf
 from unittest.mock import patch
 
-from dulwich.tests import TestCase
-
-from ..config import (
+from dulwich.config import (
     ConfigDict,
     ConfigFile,
     StackedConfig,
@@ -41,6 +39,8 @@ from ..config import (
     parse_submodules,
 )
 
+from . import TestCase
+
 
 class ConfigFileTests(TestCase):
     def from_file(self, text):

dulwich/tests/test_credentials.py → tests/test_credentials.py

@@ -21,10 +21,14 @@
 
 from urllib.parse import urlparse
 
-from dulwich.tests import TestCase
+from dulwich.config import ConfigDict
+from dulwich.credentials import (
+    match_partial_url,
+    match_urls,
+    urlmatch_credential_sections,
+)
 
-from ..config import ConfigDict
-from ..credentials import match_partial_url, match_urls, urlmatch_credential_sections
+from . import TestCase
 
 
 class TestCredentialHelpersUtils(TestCase):

dulwich/tests/test_diff_tree.py → tests/test_diff_tree.py

@@ -22,9 +22,7 @@
 
 from itertools import permutations
 
-from dulwich.tests import TestCase
-
-from ..diff_tree import (
+from dulwich.diff_tree import (
     CHANGE_COPY,
     CHANGE_MODIFY,
     CHANGE_RENAME,
@@ -42,9 +40,11 @@ from ..diff_tree import (
     tree_changes,
     tree_changes_for_merge,
 )
-from ..index import commit_tree
-from ..object_store import MemoryObjectStore
-from ..objects import Blob, ShaFile, Tree, TreeEntry
+from dulwich.index import commit_tree
+from dulwich.object_store import MemoryObjectStore
+from dulwich.objects import Blob, ShaFile, Tree, TreeEntry
+
+from . import TestCase
 from .utils import F, ext_functest_builder, functest_builder, make_object
 
 

dulwich/tests/test_fastexport.py → tests/test_fastexport.py

@@ -21,11 +21,11 @@
 import stat
 from io import BytesIO
 
-from dulwich.tests import SkipTest, TestCase
+from dulwich.object_store import MemoryObjectStore
+from dulwich.objects import ZERO_SHA, Blob, Commit, Tree
+from dulwich.repo import MemoryRepo
 
-from ..object_store import MemoryObjectStore
-from ..objects import ZERO_SHA, Blob, Commit, Tree
-from ..repo import MemoryRepo
+from . import SkipTest, TestCase
 from .utils import build_commit_graph
 
 
@@ -37,7 +37,7 @@ class GitFastExporterTests(TestCase):
         self.store = MemoryObjectStore()
         self.stream = BytesIO()
         try:
-            from ..fastexport import GitFastExporter
+            from dulwich.fastexport import GitFastExporter
         except ImportError as exc:
             raise SkipTest("python-fastimport not available") from exc
         self.fastexporter = GitFastExporter(self.stream, self.store)
@@ -85,7 +85,7 @@ class GitImportProcessorTests(TestCase):
         super().setUp()
         self.repo = MemoryRepo()
         try:
-            from ..fastexport import GitImportProcessor
+            from dulwich.fastexport import GitImportProcessor
         except ImportError as exc:
             raise SkipTest("python-fastimport not available") from exc
         self.processor = GitImportProcessor(self.repo)

dulwich/tests/test_file.py → tests/test_file.py

@@ -24,9 +24,9 @@ import shutil
 import sys
 import tempfile
 
-from dulwich.tests import SkipTest, TestCase
+from dulwich.file import FileLocked, GitFile, _fancy_rename
 
-from ..file import FileLocked, GitFile, _fancy_rename
+from . import SkipTest, TestCase
 
 
 class FancyRenameTests(TestCase):

dulwich/tests/test_grafts.py → tests/test_grafts.py

@@ -23,11 +23,11 @@ import os
 import shutil
 import tempfile
 
-from dulwich.tests import TestCase
+from dulwich.errors import ObjectFormatException
+from dulwich.objects import Tree
+from dulwich.repo import MemoryRepo, Repo, parse_graftpoints, serialize_graftpoints
 
-from ..errors import ObjectFormatException
-from ..objects import Tree
-from ..repo import MemoryRepo, Repo, parse_graftpoints, serialize_graftpoints
+from . import TestCase
 
 
 def makesha(digit):

dulwich/tests/test_graph.py → tests/test_graph.py

@@ -19,10 +19,10 @@
 
 """Tests for dulwich.graph."""
 
-from dulwich.tests import TestCase
+from dulwich.graph import WorkList, _find_lcas, can_fast_forward
+from dulwich.repo import MemoryRepo
 
-from ..graph import WorkList, _find_lcas, can_fast_forward
-from ..repo import MemoryRepo
+from . import TestCase
 from .utils import make_commit
 
 

dulwich/tests/test_greenthreads.py → tests/test_greenthreads.py

@@ -22,10 +22,10 @@
 
 import time
 
-from dulwich.tests import TestCase, skipIf
+from dulwich.object_store import MemoryObjectStore
+from dulwich.objects import Blob, Commit, Tree, parse_timezone
 
-from ..object_store import MemoryObjectStore
-from ..objects import Blob, Commit, Tree, parse_timezone
+from . import TestCase, skipIf
 
 try:
     import gevent  # noqa: F401

dulwich/tests/test_hooks.py → tests/test_hooks.py

@@ -26,9 +26,9 @@ import sys
 import tempfile
 
 from dulwich import errors
-from dulwich.tests import TestCase
+from dulwich.hooks import CommitMsgShellHook, PostCommitShellHook, PreCommitShellHook
 
-from ..hooks import CommitMsgShellHook, PostCommitShellHook, PreCommitShellHook
+from . import TestCase
 
 
 class ShellHookTests(TestCase):

dulwich/tests/test_ignore.py → tests/test_ignore.py

@@ -26,9 +26,7 @@ import shutil
 import tempfile
 from io import BytesIO
 
-from dulwich.tests import TestCase
-
-from ..ignore import (
+from dulwich.ignore import (
     IgnoreFilter,
     IgnoreFilterManager,
     IgnoreFilterStack,
@@ -37,7 +35,9 @@ from ..ignore import (
     read_ignore_patterns,
     translate,
 )
-from ..repo import Repo
+from dulwich.repo import Repo
+
+from . import TestCase
 
 POSITIVE_MATCH_TESTS = [
     (b"foo.c", b"*.c"),

dulwich/tests/test_index.py → tests/test_index.py

@@ -28,9 +28,7 @@ import sys
 import tempfile
 from io import BytesIO
 
-from dulwich.tests import TestCase, skipIf
-
-from ..index import (
+from dulwich.index import (
     Index,
     IndexEntry,
     SerializedIndexEntry,
@@ -49,9 +47,11 @@ from ..index import (
     write_index,
     write_index_dict,
 )
-from ..object_store import MemoryObjectStore
-from ..objects import S_IFGITLINK, Blob, Commit, Tree
-from ..repo import Repo
+from dulwich.object_store import MemoryObjectStore
+from dulwich.objects import S_IFGITLINK, Blob, Commit, Tree
+from dulwich.repo import Repo
+
+from . import TestCase, skipIf
 
 
 def can_symlink():
@@ -70,7 +70,7 @@ def can_symlink():
 
 
 class IndexTestCase(TestCase):
-    datadir = os.path.join(os.path.dirname(__file__), "../../testdata/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))

dulwich/tests/test_lfs.py → tests/test_lfs.py

@@ -23,7 +23,8 @@
 import shutil
 import tempfile
 
-from ..lfs import LFSStore
+from dulwich.lfs import LFSStore
+
 from . import TestCase
 
 

dulwich/tests/test_line_ending.py → tests/test_line_ending.py

@@ -20,16 +20,16 @@
 
 """Tests for the line ending conversion."""
 
-from dulwich.tests import TestCase
-
-from ..line_ending import (
+from dulwich.line_ending import (
     convert_crlf_to_lf,
     convert_lf_to_crlf,
     get_checkin_filter_autocrlf,
     get_checkout_filter_autocrlf,
     normalize_blob,
 )
-from ..objects import Blob
+from dulwich.objects import Blob
+
+from . import TestCase
 
 
 class LineEndingConversion(TestCase):

dulwich/tests/test_lru_cache.py → tests/test_lru_cache.py

@@ -20,7 +20,8 @@
 """Tests for the lru_cache module."""
 
 from dulwich import lru_cache
-from dulwich.tests import TestCase
+
+from . import TestCase
 
 
 class TestLRUCache(TestCase):

dulwich/tests/test_mailmap.py → tests/test_mailmap.py

@@ -23,7 +23,7 @@
 from io import BytesIO
 from unittest import TestCase
 
-from ..mailmap import Mailmap, read_mailmap
+from dulwich.mailmap import Mailmap, read_mailmap
 
 
 class ReadMailmapTests(TestCase):

dulwich/tests/test_missing_obj_finder.py → tests/test_missing_obj_finder.py

@@ -18,10 +18,10 @@
 # License, Version 2.0.
 #
 
-from dulwich.tests import TestCase
+from dulwich.object_store import MemoryObjectStore, MissingObjectFinder
+from dulwich.objects import Blob
 
-from ..object_store import MemoryObjectStore, MissingObjectFinder
-from ..objects import Blob
+from . import TestCase
 from .utils import build_commit_graph, make_object, make_tag
 
 

dulwich/tests/test_object_store.py → tests/test_object_store.py

@@ -29,11 +29,9 @@ from contextlib import closing
 from io import BytesIO
 from unittest import skipUnless
 
-from dulwich.tests import TestCase
-
-from ..errors import NotTreeError
-from ..index import commit_tree
-from ..object_store import (
+from dulwich.errors import NotTreeError
+from dulwich.index import commit_tree
+from dulwich.object_store import (
     DiskObjectStore,
     MemoryObjectStore,
     ObjectStoreGraphWalker,
@@ -44,7 +42,7 @@ from ..object_store import (
     read_packs_file,
     tree_lookup_path,
 )
-from ..objects import (
+from dulwich.objects import (
     S_IFGITLINK,
     Blob,
     EmptyFileException,
@@ -53,8 +51,10 @@ from ..objects import (
     TreeEntry,
     sha_to_hex,
 )
-from ..pack import REF_DELTA, write_pack_objects
-from ..protocol import DEPTH_INFINITE
+from dulwich.pack import REF_DELTA, write_pack_objects
+from dulwich.protocol import DEPTH_INFINITE
+
+from . import TestCase
 from .utils import build_pack, make_object, make_tag
 
 try:

dulwich/tests/test_objects.py → tests/test_objects.py

@@ -29,10 +29,8 @@ from contextlib import contextmanager
 from io import BytesIO
 from itertools import permutations
 
-from dulwich.tests import TestCase
-
-from ..errors import ObjectFormatException
-from ..objects import (
+from dulwich.errors import ObjectFormatException
+from dulwich.objects import (
     MAX_TIME,
     Blob,
     Commit,
@@ -54,6 +52,8 @@ from ..objects import (
     sha_to_hex,
     sorted_tree_items,
 )
+
+from . import TestCase
 from .utils import ext_functest_builder, functest_builder, make_commit, make_object
 
 a_sha = b"6f670c0fb53f9463760b7295fbb814e965fb20c8"
@@ -75,7 +75,7 @@ class BlobReadTests(TestCase):
     """Test decompression of blobs."""
 
     def get_sha_file(self, cls, base, sha):
-        dir = os.path.join(os.path.dirname(__file__), "..", "..", "testdata", 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):
@@ -855,7 +855,7 @@ class TreeTests(ShaFileCheckTests):
         self.assertEqual(_SORTED_TREE_ITEMS, x.items())
 
     def _do_test_parse_tree(self, parse_tree):
-        dir = os.path.join(os.path.dirname(__file__), "..", "..", "testdata", "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)],

dulwich/tests/test_objectspec.py → tests/test_objectspec.py

@@ -22,10 +22,8 @@
 
 # TODO: Round-trip parse-serialize-parse and serialize-parse-serialize tests.
 
-from dulwich.tests import TestCase
-
-from ..objects import Blob
-from ..objectspec import (
+from dulwich.objects import Blob
+from dulwich.objectspec import (
     parse_commit,
     parse_commit_range,
     parse_object,
@@ -35,7 +33,9 @@ from ..objectspec import (
     parse_reftuples,
     parse_tree,
 )
-from ..repo import MemoryRepo
+from dulwich.repo import MemoryRepo
+
+from . import TestCase
 from .utils import build_commit_graph
 
 

dulwich/tests/test_pack.py → tests/test_pack.py

@@ -30,13 +30,11 @@ from hashlib import sha1
 from io import BytesIO
 from typing import Set
 
-from dulwich.tests import TestCase
-
-from ..errors import ApplyDeltaError, ChecksumMismatch
-from ..file import GitFile
-from ..object_store import MemoryObjectStore
-from ..objects import Blob, Commit, Tree, hex_to_sha, sha_to_hex
-from ..pack import (
+from dulwich.errors import ApplyDeltaError, ChecksumMismatch
+from dulwich.file import GitFile
+from dulwich.object_store import MemoryObjectStore
+from dulwich.objects import Blob, Commit, Tree, hex_to_sha, sha_to_hex
+from dulwich.pack import (
     OFS_DELTA,
     REF_DELTA,
     DeltaChainIterator,
@@ -61,6 +59,8 @@ from ..pack import (
     write_pack_index_v2,
     write_pack_object,
 )
+
+from . import TestCase
 from .utils import build_pack, make_object
 
 pack1_sha = b"bc63ddad95e7321ee734ea11a7a62d314e0d7481"
@@ -80,7 +80,7 @@ class PackTests(TestCase):
         self.addCleanup(shutil.rmtree, self.tempdir)
 
     datadir = os.path.abspath(
-        os.path.join(os.path.dirname(__file__), "../../testdata/packs")
+        os.path.join(os.path.dirname(__file__), "../testdata/packs")
     )
 
     def get_pack_index(self, sha):

dulwich/tests/test_patch.py → tests/test_patch.py

@@ -22,11 +22,9 @@
 
 from io import BytesIO, StringIO
 
-from dulwich.tests import SkipTest, TestCase
-
-from ..object_store import MemoryObjectStore
-from ..objects import S_IFGITLINK, Blob, Commit, Tree
-from ..patch import (
+from dulwich.object_store import MemoryObjectStore
+from dulwich.objects import S_IFGITLINK, Blob, Commit, Tree
+from dulwich.patch import (
     get_summary,
     git_am_patch_split,
     write_blob_diff,
@@ -35,6 +33,8 @@ from ..patch import (
     write_tree_diff,
 )
 
+from . import SkipTest, TestCase
+
 
 class WriteCommitPatchTests(TestCase):
     def test_simple_bytesio(self):

dulwich/tests/test_porcelain.py → tests/test_porcelain.py

@@ -36,15 +36,15 @@ from io import BytesIO, StringIO
 from unittest import skipIf
 
 from dulwich import porcelain
-from dulwich.tests import TestCase
-
-from ..diff_tree import tree_changes
-from ..errors import CommitError
-from ..objects import ZERO_SHA, Blob, Tag, Tree
-from ..porcelain import CheckoutError
-from ..repo import NoIndexPresent, Repo
-from ..server import DictBackend
-from ..web import make_server, make_wsgi_chain
+from dulwich.diff_tree import tree_changes
+from dulwich.errors import CommitError
+from dulwich.objects import ZERO_SHA, Blob, Tag, Tree
+from dulwich.porcelain import CheckoutError
+from dulwich.repo import NoIndexPresent, Repo
+from dulwich.server import DictBackend
+from dulwich.web import make_server, make_wsgi_chain
+
+from . import TestCase
 from .utils import build_commit_graph, make_commit, make_object
 
 try:

dulwich/tests/test_protocol.py → tests/test_protocol.py

@@ -22,10 +22,8 @@
 
 from io import BytesIO
 
-from dulwich.tests import TestCase
-
-from ..errors import HangupException
-from ..protocol import (
+from dulwich.errors import HangupException
+from dulwich.protocol import (
     MULTI_ACK,
     MULTI_ACK_DETAILED,
     SINGLE_ACK,
@@ -39,6 +37,8 @@ from ..protocol import (
     extract_want_line_capabilities,
 )
 
+from . import TestCase
+
 
 class BaseProtocolTests:
     def test_write_pkt_line_none(self):

dulwich/tests/test_reflog.py → tests/test_reflog.py

@@ -22,16 +22,16 @@
 
 from io import BytesIO
 
-from dulwich.tests import TestCase
-
-from ..objects import ZERO_SHA
-from ..reflog import (
+from dulwich.objects import ZERO_SHA
+from dulwich.reflog import (
     drop_reflog_entry,
     format_reflog_line,
     parse_reflog_line,
     read_reflog,
 )
 
+from . import TestCase
+
 
 class ReflogLineTests(TestCase):
     def test_format(self):

dulwich/tests/test_refs.py → tests/test_refs.py

@@ -27,11 +27,9 @@ from io import BytesIO
 from typing import ClassVar, Dict
 
 from dulwich import errors
-from dulwich.tests import SkipTest, TestCase
-
-from ..file import GitFile
-from ..objects import ZERO_SHA
-from ..refs import (
+from dulwich.file import GitFile
+from dulwich.objects import ZERO_SHA
+from dulwich.refs import (
     DictRefsContainer,
     InfoRefsContainer,
     SymrefLoop,
@@ -43,7 +41,9 @@ from ..refs import (
     strip_peeled_refs,
     write_packed_refs,
 )
-from ..repo import Repo
+from dulwich.repo import Repo
+
+from . import SkipTest, TestCase
 from .utils import open_repo, tear_down_repo
 
 

dulwich/tests/test_repository.py → tests/test_repository.py

@@ -30,12 +30,10 @@ import tempfile
 import warnings
 
 from dulwich import errors, objects, porcelain
-from dulwich.tests import TestCase, skipIf
-
-from ..config import Config
-from ..errors import NotGitRepository
-from ..object_store import tree_lookup_path
-from ..repo import (
+from dulwich.config import Config
+from dulwich.errors import NotGitRepository
+from dulwich.object_store import tree_lookup_path
+from dulwich.repo import (
     InvalidUserIdentity,
     MemoryRepo,
     Repo,
@@ -43,6 +41,8 @@ from ..repo import (
     UnsupportedVersion,
     check_user_identity,
 )
+
+from . import TestCase, skipIf
 from .utils import open_repo, setup_warning_catcher, tear_down_repo
 
 missing_sha = b"b91fa4d900e17e99b433218e988c4eb4a3e9a097"
@@ -406,7 +406,7 @@ class RepositoryRootTests(TestCase):
         temp_dir = self.mkdtemp()
         self.addCleanup(shutil.rmtree, temp_dir)
         repo_dir = os.path.join(
-            os.path.dirname(__file__), "..", "..", "testdata", "repos"
+            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)

dulwich/tests/test_server.py → tests/test_server.py

@@ -27,19 +27,17 @@ import tempfile
 from io import BytesIO
 from typing import Dict, List
 
-from dulwich.tests import TestCase
-
-from ..errors import (
+from dulwich.errors import (
     GitProtocolError,
     HangupException,
     NotGitRepository,
     UnexpectedCommandError,
 )
-from ..object_store import MemoryObjectStore
-from ..objects import Tree
-from ..protocol import ZERO_SHA, format_capability_line
-from ..repo import MemoryRepo, Repo
-from ..server import (
+from dulwich.object_store import MemoryObjectStore
+from dulwich.objects import Tree
+from dulwich.protocol import ZERO_SHA, format_capability_line
+from dulwich.repo import MemoryRepo, Repo
+from dulwich.server import (
     Backend,
     DictBackend,
     FileSystemBackend,
@@ -55,6 +53,8 @@ from ..server import (
     serve_command,
     update_server_info,
 )
+
+from . import TestCase
 from .utils import make_commit, make_tag
 
 ONE = b"1" * 40

dulwich/tests/test_stash.py → tests/test_stash.py

@@ -20,8 +20,9 @@
 
 """Tests for stashes."""
 
-from ..repo import MemoryRepo
-from ..stash import Stash
+from dulwich.repo import MemoryRepo
+from dulwich.stash import Stash
+
 from . import TestCase
 
 

dulwich/tests/test_utils.py → tests/test_utils.py

@@ -20,10 +20,10 @@
 
 """Tests for git test utilities."""
 
-from dulwich.tests import TestCase
+from dulwich.object_store import MemoryObjectStore
+from dulwich.objects import Blob
 
-from ..object_store import MemoryObjectStore
-from ..objects import Blob
+from . import TestCase
 from .utils import build_commit_graph, make_object
 
 

dulwich/tests/test_walk.py → tests/test_walk.py

@@ -23,13 +23,13 @@
 from itertools import permutations
 from unittest import expectedFailure
 
-from dulwich.tests import TestCase
+from dulwich.diff_tree import CHANGE_MODIFY, CHANGE_RENAME, RenameDetector, TreeChange
+from dulwich.errors import MissingCommitError
+from dulwich.object_store import MemoryObjectStore
+from dulwich.objects import Blob, Commit
+from dulwich.walk import ORDER_TOPO, WalkEntry, Walker, _topo_reorder
 
-from ..diff_tree import CHANGE_MODIFY, CHANGE_RENAME, RenameDetector, TreeChange
-from ..errors import MissingCommitError
-from ..object_store import MemoryObjectStore
-from ..objects import Blob, Commit
-from ..walk import ORDER_TOPO, WalkEntry, Walker, _topo_reorder
+from . import TestCase
 from .utils import F, build_commit_graph, make_object, make_tag
 
 

dulwich/tests/test_web.py → tests/test_web.py

@@ -26,13 +26,11 @@ import re
 from io import BytesIO
 from typing import Type
 
-from dulwich.tests import TestCase
-
-from ..object_store import MemoryObjectStore
-from ..objects import Blob
-from ..repo import BaseRepo, MemoryRepo
-from ..server import DictBackend
-from ..web import (
+from dulwich.object_store import MemoryObjectStore
+from dulwich.objects import Blob
+from dulwich.repo import BaseRepo, MemoryRepo
+from dulwich.server import DictBackend
+from dulwich.web import (
     HTTP_ERROR,
     HTTP_FORBIDDEN,
     HTTP_NOT_FOUND,
@@ -50,6 +48,8 @@ from ..web import (
     handle_service_request,
     send_file,
 )
+
+from . import TestCase
 from .utils import make_object, make_tag
 
 

dulwich/tests/utils.py → tests/utils.py

@@ -28,11 +28,9 @@ import time
 import types
 import warnings
 
-from dulwich.tests import SkipTest
-
-from ..index import commit_tree
-from ..objects import Commit, FixedSha, Tag, object_class
-from ..pack import (
+from dulwich.index import commit_tree
+from dulwich.objects import Commit, FixedSha, Tag, object_class
+from dulwich.pack import (
     DELTA_TYPES,
     OFS_DELTA,
     REF_DELTA,
@@ -42,7 +40,9 @@ from ..pack import (
     write_pack_header,
     write_pack_object,
 )
-from ..repo import Repo
+from dulwich.repo import Repo
+
+from . import SkipTest
 
 # Plain files are very frequently used in tests, so let the mode be very short.
 F = 0o100644  # Shorthand mode for Files.
@@ -65,7 +65,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__), "..", "..", "testdata", "repos", name
+        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)