Launchpad itself

Merge ~pappacena/launchpad:fix-test-helper into launchpad:master

  1. Git
  2. lp:~pappacena/launchpad
  3. fix-test-helper
  4. Merge into master
Proposed by Thiago F. Pappacena
Status: Merged
Approved by: Thiago F. Pappacena
Approved revision: d62fba7ee2f27b28b5edb3a12fba7d7309d6029b
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~pappacena/launchpad:fix-test-helper
Merge into: launchpad:master
Diff against target: 41 lines (+4/-4)
3 files modified
lib/lp/code/doc/branch-merge-proposal-notifications.txt (+1/-1)
lib/lp/code/model/tests/test_codereviewvote.py (+1/-1)
lib/lp/code/stories/branches/xx-branchmergeproposals.txt (+2/-2)
Reviewer Review Type Date Requested Status
Thiago F. Pappacena (community) Approve
Review via email: mp+388021@code.launchpad.net

Commit message

[testfix] Fixing the calls to test helper method that create bzr branches and git refs (the parameters changed in a previous commit)

To post a comment you must log in.
Revision history for this message
Thiago F. Pappacena (pappacena) wrote :

Self-approving trivial test code change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/code/doc/branch-merge-proposal-notifications.txt b/lib/lp/code/doc/branch-merge-proposal-notifications.txt
2index db43116..1cf3c56 100644
3--- a/lib/lp/code/doc/branch-merge-proposal-notifications.txt
4+++ b/lib/lp/code/doc/branch-merge-proposal-notifications.txt
5@@ -25,7 +25,7 @@ notification they would like to receive.
6 >>> target_owner = factory.makePerson(email='target_owner@example.com')
7 >>> target_branch = factory.makeBranch(owner=target_owner)
8 >>> bmp = make_merge_proposal_without_reviewers(
9- ... factory, target_branch=target_branch)
10+ ... factory, target=target_branch)
11 >>> previewdiff = factory.makePreviewDiff(merge_proposal=bmp)
12 >>> transaction.commit()
13 >>> source_subscriber = factory.makePerson(
14diff --git a/lib/lp/code/model/tests/test_codereviewvote.py b/lib/lp/code/model/tests/test_codereviewvote.py
15index f0794f5..8a2edde 100644
16--- a/lib/lp/code/model/tests/test_codereviewvote.py
17+++ b/lib/lp/code/model/tests/test_codereviewvote.py
18@@ -61,7 +61,7 @@ class TestCodeReviewVote(TestCaseWithFactory):
19 target_branch = self.factory.makeBranch(
20 owner=owner, information_type=InformationType.USERDATA)
21 merge_proposal = make_merge_proposal_without_reviewers(
22- self.factory, target_branch=target_branch, registrant=owner)
23+ self.factory, target=target_branch, registrant=owner)
24 reviewer = self.factory.makePerson()
25 vote = merge_proposal.nominateReviewer(reviewer, owner)
26 login(ANONYMOUS)
27diff --git a/lib/lp/code/stories/branches/xx-branchmergeproposals.txt b/lib/lp/code/stories/branches/xx-branchmergeproposals.txt
28index 8c1eb2e..3d48aa0 100644
29--- a/lib/lp/code/stories/branches/xx-branchmergeproposals.txt
30+++ b/lib/lp/code/stories/branches/xx-branchmergeproposals.txt
31@@ -638,8 +638,8 @@ one without a reviewer.
32 ... '~fred/fooix/feature')
33 >>> fooix = getUtility(IProductSet).getByName('fooix')
34 >>> bmp = make_merge_proposal_without_reviewers(
35- ... factory, registrant=eric, source_branch=source_branch,
36- ... target_branch=fooix.development_focus.branch,
37+ ... factory, registrant=eric, source=source_branch,
38+ ... target=fooix.development_focus.branch,
39 ... set_state=BranchMergeProposalStatus.NEEDS_REVIEW)
40 >>> bmp_url = canonical_url(bmp)
41 >>> branch_url = canonical_url(bmp.source_branch)