launchpad-reviewers team mailing list archive

[Tom Wardill <tom.wardill@xxxxxxxxxxxxx>]

Tom Wardill has proposed merging ~twom/launchpad:oci-policy-fix-other-oci-recipe-test-formats into launchpad:master.

Commit message:
Fix non-oci tests that use the ref format

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~twom/launchpad/+git/launchpad/+merge/402246
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~twom/launchpad:oci-policy-fix-other-oci-recipe-test-formats into launchpad:master.

diff --git a/lib/lp/registry/tests/test_personmerge.py b/lib/lp/registry/tests/test_personmerge.py
index ccb42c6..a1c00be 100644
--- a/lib/lp/registry/tests/test_personmerge.py
+++ b/lib/lp/registry/tests/test_personmerge.py
@@ -719,8 +719,8 @@ class TestMergePeople(TestCaseWithFactory, KarmaTestMixin):
         self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
         duplicate = self.factory.makePerson()
         mergee = self.factory.makePerson()
-        [ref] = self.factory.makeGitRefs()
-        [ref2] = self.factory.makeGitRefs()
+        [ref] = self.factory.makeGitRefs(paths=['refs/heads/v1.0-20.04'])
+        [ref2] = self.factory.makeGitRefs(paths=['refs/heads/v1.0-20.04'])
         self.factory.makeOCIRecipe(
             registrant=duplicate, owner=duplicate, name=u'foo', git_ref=ref)
         self.factory.makeOCIRecipe(
diff --git a/lib/lp/scripts/tests/test_garbo.py b/lib/lp/scripts/tests/test_garbo.py
index ba2b5dd..2b5fa34 100644
--- a/lib/lp/scripts/tests/test_garbo.py
+++ b/lib/lp/scripts/tests/test_garbo.py
@@ -1099,7 +1099,7 @@ class TestGarbo(FakeAdapterMixin, TestCaseWithFactory):
         for i in range(5):
             repo = removeSecurityProxy(self.factory.makeGitRepository())
             [ref1, ref2] = self.factory.makeGitRefs(
-                repository=repo, paths=["a", "b"])
+                repository=repo, paths=["refs/heads/a-20.04", "b"])
             self.factory.makeBranchMergeProposalForGit(
                 target_ref=ref1, source_ref=ref2)
             self.factory.makeSourcePackageRecipe(branches=[ref1])