Launchpad itself

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

  1. Git
  2. lp:~twom/launchpad
  3. oci-test-fix-text-not-str
  4. Merge into master
Proposed by Tom Wardill
Status: Merged
Approved by: Tom Wardill
Approved revision: bb2fae289878c0f964b336328a683aef73042c25
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~twom/launchpad:oci-test-fix-text-not-str
Merge into: launchpad:master
Diff against target: 15 lines (+2/-2)
1 file modified
lib/lp/registry/tests/test_personmerge.py (+2/-2)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+402340@code.launchpad.net

Commit message

makeGitRefs takes text not str on python2

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/registry/tests/test_personmerge.py b/lib/lp/registry/tests/test_personmerge.py
2index a1c00be..5c75436 100644
3--- a/lib/lp/registry/tests/test_personmerge.py
4+++ b/lib/lp/registry/tests/test_personmerge.py
5@@ -719,8 +719,8 @@ class TestMergePeople(TestCaseWithFactory, KarmaTestMixin):
6 self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
7 duplicate = self.factory.makePerson()
8 mergee = self.factory.makePerson()
9- [ref] = self.factory.makeGitRefs(paths=['refs/heads/v1.0-20.04'])
10- [ref2] = self.factory.makeGitRefs(paths=['refs/heads/v1.0-20.04'])
11+ [ref] = self.factory.makeGitRefs(paths=[u'refs/heads/v1.0-20.04'])
12+ [ref2] = self.factory.makeGitRefs(paths=[u'refs/heads/v1.0-20.04'])
13 self.factory.makeOCIRecipe(
14 registrant=duplicate, owner=duplicate, name=u'foo', git_ref=ref)
15 self.factory.makeOCIRecipe(

Subscribers

People subscribed via source and target branches

to status/vote changes: