Merge pull request #340 from jelmer/merge-3.3

Merge 3.3

Author: jelmer

breezy/tests/__init__.py

@@ -492,14 +492,6 @@ def addSuccess(self, test, details=None):
                     f"{self._formatTime(benchmark_time)} {test.id()}\n"
                 )
         self.report_success(test)
-        # In testtools >= 2.8, TextTestResult.addSuccess() writes "." or "ok"
-        # to the stream, which conflicts with our custom output formatting.
-        # We handle all output ourselves via report_success(), so we don't
-        # need to call the parent method for 2.8+.
-        # For older versions, call super() which was a no-op but may have
-        # been used for side effects.
-        if testtools.__version__ < (2, 8):
-            super().addSuccess(test, details)
         test._log_contents = ""
 
     def addExpectedFailure(self, test, err):

breezy/tests/test_selftest.py

@@ -2106,7 +2106,7 @@ def test_foo(self):
         orig_test = Test("test_foo")
         cloned_test = tests.clone_test(orig_test, orig_test.id() + "(cloned)")
         orig_test.run(unittest.TestResult())
-        self.assertEqual("foo", orig_test.getDetails()["foo"].iter_bytes())
+        self.assertEqual("foo", "".join(orig_test.getDetails()["foo"].iter_bytes()))
         self.assertEqual(None, cloned_test.getDetails().get("foo"))
 
     def test_double_apply_scenario_preserves_first_scenario(self):

breezy/tests/test_setup.py

@@ -28,6 +28,5 @@ def test_version_with_string(self):
         """Test version comparison for pyrex-specific version strings."""
         # We really care about two pyrex specific versions and our ability to
         # detect them
-        lv = version.Version
-        self.assertLess(lv("0.9.4.1"), lv("0.17.beta1"))
-        self.assertLess(lv("0.9.6.3"), lv("0.10"))
+        self.assertLess(version.Version("0.9.4.1"), version.Version("0.17.beta1"))
+        self.assertLess(version.Version("0.9.6.3"), version.Version("0.10"))

doc/en/release-notes/brz-3.3.txt

@@ -5,6 +5,21 @@ Breezy Release Notes
 .. toctree::
    :maxdepth: 1
 
+brz 3.3.21
+##########
+
+ * Require testtools 2.8+.
+   (Jelmer Vernooij)
+
+ * Restrict maximum dulwich version.
+   (Jelmer Vernooij)
+
+ * Fix ``iter_bytes()`` usage in tests.
+   (Jelmer Vernooij)
+
+ * Fix object store lifecycle management for dulwich 0.25+.
+   (Jelmer Vernooij)
+
 brz 3.3.20
 ##########
 

pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
     "fastbencode",
     "patiencediff",
     "merge3",
-    "dulwich>=0.25.0,<2",
+    "dulwich>=1,<2",
     "urllib3>=1.24.1",
     "pyyaml",
     "tzlocal",
@@ -47,7 +47,7 @@ Repository = "https://github.com/breezy-team/breezy"
 
 [project.optional-dependencies]
 fastimport = ["fastimport>=0.9.8"]
-git = ["dulwich>=0.24.3"]
+git = ["dulwich>=1,<2"]
 launchpad = ["launchpadlib>=1.6.3"]
 workspace = ["pyinotify", "pyasyncore;python_version>='3.12'"]
 doc = [