Merge ~twom/launchpad:oci-policy-fix-registry-tests into launchpad:master

[Tom Wardill]

Fix tests creating valid branch names

[Colin Watson (cjwatson)]

review: Approve

diff --git a/lib/lp/oci/tests/test_ociregistryclient.py b/lib/lp/oci/tests/test_ociregistryclient.py
index 60729e1..aa71aa3 100644
--- a/lib/lp/oci/tests/test_ociregistryclient.py
+++ b/lib/lp/oci/tests/test_ociregistryclient.py
@@ -117,7 +117,12 @@ class TestOCIRegistryClient(OCIConfigHelperMixin, SpyProxyCallsMixin,
             }
         }]
         self.config = {"rootfs": {"diff_ids": ["diff_id_1", "diff_id_2"]}}
-        self.build = self.factory.makeOCIRecipeBuild()
+        # This produces a git ref that does not match the 'valid' OCI branch
+        # format, so will not get multiple tags. Multiple tags are tested
+        # explicitly.
+        [git_ref] = self.factory.makeGitRefs()
+        recipe = self.factory.makeOCIRecipe(git_ref=git_ref)
+        self.build = self.factory.makeOCIRecipeBuild(recipe=recipe)
         self.push_rule = self.factory.makeOCIPushRule(recipe=self.build.recipe)
         self.client = OCIRegistryClient()