Launchpad itself

Merge ~andrey-fedoseev/launchpad:packaging-security into launchpad:master

  1. Git
  2. lp:~andrey-fedoseev/launchpad
  3. packaging-security
  4. Merge into master
Proposed by Andrey Fedoseev
Status: Merged
Approved by: Andrey Fedoseev
Approved revision: 862ec68999f7af77233db5ecd73e832be437b46b
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~andrey-fedoseev/launchpad:packaging-security
Merge into: launchpad:master
Diff against target: 18 lines (+4/-3)
1 file modified
lib/lp/code/model/tests/test_branchtarget.py (+4/-3)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+430130@code.launchpad.net

Commit message

Fix another failing test caused by the recent changes in `Packaging` security

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
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/model/tests/test_branchtarget.py b/lib/lp/code/model/tests/test_branchtarget.py
2index 1b74d7a..b73a527 100644
3--- a/lib/lp/code/model/tests/test_branchtarget.py
4+++ b/lib/lp/code/model/tests/test_branchtarget.py
5@@ -434,9 +434,10 @@ class TestProductBranchTarget(TestCaseWithFactory, BaseBranchTargetTests):
6 # Packages that are linked to the products are mergeable.
7 branch = self.factory.makePackageBranch()
8 # Link it up.
9- branch.sourcepackage.setPackaging(
10- self.original.development_focus, branch.owner
11- )
12+ with person_logged_in(branch.sourcepackage.owner):
13+ branch.sourcepackage.setPackaging(
14+ self.original.development_focus, branch.owner
15+ )
16 self.assertTrue(self.target.areBranchesMergeable(branch.target))
17
18 def test_default_merge_target(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: