Merge ~ines-almeida/launchpad:pro-enable-core18/fix-unit-tests into launchpad:master

Proposed by Ines Almeida
Status: Merged
Approved by: Colin Watson
Approved revision: 50ca0fd20c3462ae8716ca2b2a5cc7f2de9bbbab
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~ines-almeida/launchpad:pro-enable-core18/fix-unit-tests
Merge into: launchpad:master
Diff against target: 22 lines (+9/-2)
1 file modified
lib/lp/snappy/tests/test_snap.py (+9/-2)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+454254@code.launchpad.net

Commit message

Fix failing pro-enable unit test

Description of the change

I moved this unit test last minute, and missed re-running it

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/snappy/tests/test_snap.py b/lib/lp/snappy/tests/test_snap.py
2index f94ab74..14fda0d 100644
3--- a/lib/lp/snappy/tests/test_snap.py
4+++ b/lib/lp/snappy/tests/test_snap.py
5@@ -3654,8 +3654,15 @@ class TestSnapProcessors(TestCaseWithFactory):
6 GitHostingFixture()
7 ).getBlob = lambda path, *args, **kwargs: blob
8
9- components = self.makeSnapComponents(git_ref=git_ref)
10- components["pro_enable"] = None
11+ registrant = self.factory.makePerson()
12+ components = dict(
13+ registrant=registrant,
14+ owner=self.factory.makeTeam(owner=registrant),
15+ distro_series=self.factory.makeDistroSeries(),
16+ name=self.factory.getUniqueUnicode("snap-name"),
17+ git_ref=git_ref,
18+ pro_enable=None,
19+ )
20
21 snap = getUtility(ISnapSet).new(**components)
22 self.assertFalse(snap.pro_enable)

Subscribers

People subscribed via source and target branches

to status/vote changes: