Launchpad itself

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

  1. Git
  2. lp:~ines-almeida/launchpad
  3. pro-enable-core18/fix-unit-tests
  4. Merge into master
Proposed by Ines Almeida
Status: Merged
Approved by: Ines Almeida
Approved revision: 3bee7b2daa259ab7a5b8d4f6144bf0ae4189b36d
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: 18 lines (+0/-4)
1 file modified
lib/lp/snappy/tests/test_snap.py (+0/-4)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+454273@code.launchpad.net

Commit message

Fix failing pro-enable unit test

Description of the change

Another one to fix. Apparently I had missed merging in some test updates in my initial MP. These extra asserts are not necessary at all and don't make sense

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 14fda0d..5675585 100644
3--- a/lib/lp/snappy/tests/test_snap.py
4+++ b/lib/lp/snappy/tests/test_snap.py
5@@ -309,13 +309,9 @@ class TestSnap(TestCaseWithFactory):
6 return
7
8 self.assertTrue(snaps[0].pro_enable) # Snap with no base
9- self.assertTrue(removeSecurityProxy(snaps[0])._pro_enable)
10 self.assertTrue(snaps[1].pro_enable) # Snap with 'core' base
11- self.assertTrue(removeSecurityProxy(snaps[1])._pro_enable)
12 self.assertFalse(snaps[2].pro_enable) # Snap with 'core18' base
13- self.assertFalse(removeSecurityProxy(snaps[2])._pro_enable)
14 self.assertFalse(snaps[3].pro_enable) # Snap without snapcraft.yaml
15- self.assertFalse(removeSecurityProxy(snaps[3])._pro_enable)
16
17 def makeBuildableDistroArchSeries(self, **kwargs):
18 das = self.factory.makeDistroArchSeries(**kwargs)

Subscribers

People subscribed via source and target branches

to status/vote changes: