Merge ~twom/launchpad:oci-test-fix-text-not-str into launchpad:master

[Tom Wardill]

makeGitRefs takes text not str on python2

[Colin Watson (cjwatson)]

review: Approve

diff --git a/lib/lp/registry/tests/test_personmerge.py b/lib/lp/registry/tests/test_personmerge.py
index a1c00be..5c75436 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(paths=['refs/heads/v1.0-20.04'])
-        [ref2] = self.factory.makeGitRefs(paths=['refs/heads/v1.0-20.04'])
+        [ref] = self.factory.makeGitRefs(paths=[u'refs/heads/v1.0-20.04'])
+        [ref2] = self.factory.makeGitRefs(paths=[u'refs/heads/v1.0-20.04'])
         self.factory.makeOCIRecipe(
             registrant=duplicate, owner=duplicate, name=u'foo', git_ref=ref)
         self.factory.makeOCIRecipe(