launchpad-reviewers team mailing list archive

[Colin Watson <mp+415818@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-buildd:tests-breezy into launchpad-buildd:master.

Commit message:
Handle running the test suite with Breezy

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/415818

We need to set `BRZ_*` environment variables in tests as well as `BZR_*`.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-buildd:tests-breezy into launchpad-buildd:master.

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 <committer@xxxxxxxxxxx>"
         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)