From f19ab1df78cf6ffb508a5dadb5ef9854677f5ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
Date: Thu, 28 Sep 2023 17:06:17 +0000
Subject: [PATCH 1/2] Drop explicit format specification where the default
 format now supports necessary features

---
 breezy/bzr/tests/test_testament.py                    | 2 +-
 breezy/plugins/bash_completion/tests/test_bashcomp.py | 8 ++++----
 breezy/tests/blackbox/test_branch.py                  | 3 +--
 breezy/tests/blackbox/test_reference.py               | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/breezy/bzr/tests/test_testament.py b/breezy/bzr/tests/test_testament.py
index 3b4e66fad2..a89100e287 100644
--- a/breezy/bzr/tests/test_testament.py
+++ b/breezy/bzr/tests/test_testament.py
@@ -30,7 +30,7 @@ class TestamentSetup(TestCaseWithTransport):
 
     def setUp(self):
         super().setUp()
-        self.wt = self.make_branch_and_tree('.', format='development-subtree')
+        self.wt = self.make_branch_and_tree('.')
         self.wt.set_root_id(b'TREE_ROT')
         b = self.b = self.wt.branch
         b.nick = "test branch"
diff --git a/breezy/plugins/bash_completion/tests/test_bashcomp.py b/breezy/plugins/bash_completion/tests/test_bashcomp.py
index bb42be28de..a1734dd886 100644
--- a/breezy/plugins/bash_completion/tests/test_bashcomp.py
+++ b/breezy/plugins/bash_completion/tests/test_bashcomp.py
@@ -176,7 +176,7 @@ def get_script(self):
 
     def test_revspec_tag_all(self):
         self.requireFeature(features.sed_feature)
-        wt = self.make_branch_and_tree('.', format='dirstate-tags')
+        wt = self.make_branch_and_tree('.')
         wt.branch.tags.set_tag('tag1', b'null:')
         wt.branch.tags.set_tag('tag2', b'null:')
         wt.branch.tags.set_tag('3tag', b'null:')
@@ -185,7 +185,7 @@ def test_revspec_tag_all(self):
 
     def test_revspec_tag_prefix(self):
         self.requireFeature(features.sed_feature)
-        wt = self.make_branch_and_tree('.', format='dirstate-tags')
+        wt = self.make_branch_and_tree('.')
         wt.branch.tags.set_tag('tag1', b'null:')
         wt.branch.tags.set_tag('tag2', b'null:')
         wt.branch.tags.set_tag('3tag', b'null:')
@@ -194,7 +194,7 @@ def test_revspec_tag_prefix(self):
 
     def test_revspec_tag_spaces(self):
         self.requireFeature(features.sed_feature)
-        wt = self.make_branch_and_tree('.', format='dirstate-tags')
+        wt = self.make_branch_and_tree('.')
         wt.branch.tags.set_tag('tag with spaces', b'null:')
         self.complete(['brz', 'log', '-r', 'tag', ':', 't'])
         self.assertCompletionEquals(r'tag\ with\ spaces')
@@ -205,7 +205,7 @@ def test_revspec_tag_spaces(self):
 
     def test_revspec_tag_endrange(self):
         self.requireFeature(features.sed_feature)
-        wt = self.make_branch_and_tree('.', format='dirstate-tags')
+        wt = self.make_branch_and_tree('.')
         wt.branch.tags.set_tag('tag1', b'null:')
         wt.branch.tags.set_tag('tag2', b'null:')
         self.complete(['brz', 'log', '-r', '3..tag', ':', 't'])
diff --git a/breezy/tests/blackbox/test_branch.py b/breezy/tests/blackbox/test_branch.py
index b2d76eb775..9e2b06057b 100644
--- a/breezy/tests/blackbox/test_branch.py
+++ b/breezy/tests/blackbox/test_branch.py
@@ -485,8 +485,7 @@ def test_branch_stacked_branch_stacked(self):
 
     def test_branch_stacked(self):
         # We have a mainline
-        trunk_tree = self.make_branch_and_tree('mainline',
-                                               format='1.9')
+        trunk_tree = self.make_branch_and_tree('mainline')
         original_revid = trunk_tree.commit('mainline')
         self.assertRevisionInRepository('mainline', original_revid)
         # and a branch from it which is stacked
diff --git a/breezy/tests/blackbox/test_reference.py b/breezy/tests/blackbox/test_reference.py
index 6fc7ce96c0..e8345d5999 100644
--- a/breezy/tests/blackbox/test_reference.py
+++ b/breezy/tests/blackbox/test_reference.py
@@ -22,7 +22,7 @@
 class TestReference(TestCaseWithTransport):
 
     def get_default_format(self):
-        return controldir.format_registry.make_controldir('development-subtree')
+        return controldir.format_registry.make_controldir('2a')
 
     def test_no_args_lists(self):
         tree = self.make_branch_and_tree('branch')

From c3fe7a4e278ccc9d0c3b19a1c30e7b80c648313a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
Date: Thu, 28 Sep 2023 17:06:57 +0000
Subject: [PATCH 2/2] Add 'make testr'

---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index 5de4ca3c31..531c39a242 100644
--- a/Makefile
+++ b/Makefile
@@ -317,3 +317,9 @@ check-dist-tarball:
 
 reformat:
 	isort .
+
+.testrepository:
+	testr init
+
+testr: .testrepository all
+	testr run --parallel