Merge ~cjwatson/launchpad-buildd:tests-breezy into launchpad-buildd:master

[Colin Watson]

Handle running the test suite with Breezy

We need to set `BRZ_*` environment variables in tests as well as `BZR_*`.

focal's `bzr` package is in fact a transitional package for Breezy, so tests fail on focal without this.

[Jürgen Gmach (jugmac00)]

This fix seems only relevant when you have a setup different from the one described in https://launchpad-buildd.readthedocs.io/en/latest/how-to/developing.html

Did you install Breezy manually? Or is Breezy the new default Bazaar handling tool in e.g. Jammy?

It would be great to add some more information to the commit message.

review: Approve

[Colin Watson (cjwatson)]

On focal:

  $ apt-cache show bzr
  Package: bzr
  ...
  Description-en: transitional dummy package for brz
   This is a transitional package, replacing the Bazaar packaging
   with the Breezy packaging.

So if you follow the development setup instructions on focal instead of bionic you'll see this problem. I'll adjust the commit message to explain this.

diff --git a/lpbuildd/target/tests/test_generate_translation_templates.py b/lpbuildd/target/tests/test_generate_translation_templates.py
index 54ac395..0b72b29 100644
--- a/lpbuildd/target/tests/test_generate_translation_templates.py
+++ b/lpbuildd/target/tests/test_generate_translation_templates.py
@@ -56,16 +56,19 @@ class TestGenerateTranslationTemplates(TestCase):
         """Make a bzr branch from an existing directory."""
         bzr_home = self.useFixture(TempDir()).path
         self.useFixture(EnvironmentVariable("BZR_HOME", bzr_home))
+        self.useFixture(EnvironmentVariable("BRZ_HOME", bzr_home))
         self.useFixture(EnvironmentVariable("BZR_EMAIL"))
+        self.useFixture(EnvironmentVariable("BRZ_EMAIL"))
         self.useFixture(EnvironmentVariable("EMAIL"))
 
         subprocess.check_call(["bzr", "init", "-q"], cwd=branch_path)
         subprocess.check_call(["bzr", "add", "-q"], cwd=branch_path)
         committer_id = "Committer <[e-mail]>"
         with EnvironmentVariable("BZR_EMAIL", committer_id):
-            subprocess.check_call(
-                ["bzr", "commit", "-q", "-m", "Populating branch."],
-                cwd=branch_path)
+            with EnvironmentVariable("BRZ_EMAIL", committer_id):
+                subprocess.check_call(
+                    ["bzr", "commit", "-q", "-m", "Populating branch."],
+                    cwd=branch_path)
 
     def make_git_branch(self, branch_path):
         subprocess.check_call(["git", "init", "-q"], cwd=branch_path)