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

[Ines Almeida]

Fix failing pro-enable unit test

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

[Colin Watson (cjwatson)]

review: Approve

diff --git a/lib/lp/snappy/tests/test_snap.py b/lib/lp/snappy/tests/test_snap.py
index f94ab74..14fda0d 100644
--- a/lib/lp/snappy/tests/test_snap.py
+++ b/lib/lp/snappy/tests/test_snap.py
@@ -3654,8 +3654,15 @@ class TestSnapProcessors(TestCaseWithFactory):
             GitHostingFixture()
         ).getBlob = lambda path, *args, **kwargs: blob
 
-        components = self.makeSnapComponents(git_ref=git_ref)
-        components["pro_enable"] = None
+        registrant = self.factory.makePerson()
+        components = dict(
+            registrant=registrant,
+            owner=self.factory.makeTeam(owner=registrant),
+            distro_series=self.factory.makeDistroSeries(),
+            name=self.factory.getUniqueUnicode("snap-name"),
+            git_ref=git_ref,
+            pro_enable=None,
+        )
 
         snap = getUtility(ISnapSet).new(**components)
         self.assertFalse(snap.pro_enable)