Launchpad itself

Merge ~pappacena/launchpad:testfix-snap-admin-permission-regression into launchpad:master

  1. Git
  2. lp:~pappacena/launchpad
  3. testfix-snap-admin-permission-regression
  4. Merge into master
Proposed by Thiago F. Pappacena
Status: Merged
Approved by: Thiago F. Pappacena
Approved revision: 13bffef9e09c68e1ec8834eb778014e89970d3ca
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~pappacena/launchpad:testfix-snap-admin-permission-regression
Merge into: launchpad:master
Diff against target: 87 lines (+14/-15)
2 files modified
lib/lp/snappy/browser/tests/test_snap.py (+9/-9)
lib/lp/snappy/tests/test_snap.py (+5/-6)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+399614@code.launchpad.net

Commit message

Using admin (instead of commercial admin) when testing special snap permissions

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/browser/tests/test_snap.py b/lib/lp/snappy/browser/tests/test_snap.py
2index d763dae..c57f412 100644
3--- a/lib/lp/snappy/browser/tests/test_snap.py
4+++ b/lib/lp/snappy/browser/tests/test_snap.py
5@@ -717,8 +717,8 @@ class TestSnapAdminView(BaseTestSnapView):
6 def test_admin_snap(self):
7 # Admins can change require_virtualized, privacy, and allow_internet.
8 login("admin@canonical.com")
9- commercial_admin = self.factory.makePerson(
10- member_of=[getUtility(ILaunchpadCelebrities).commercial_admin])
11+ admin = self.factory.makePerson(
12+ member_of=[getUtility(ILaunchpadCelebrities).admin])
13 login_person(self.person)
14 project = self.factory.makeProduct(name="my-project")
15 with person_logged_in(project.owner):
16@@ -732,7 +732,7 @@ class TestSnapAdminView(BaseTestSnapView):
17 self.factory.makeAccessPolicy(
18 pillar=project, type=InformationType.PRIVATESECURITY)
19 private = InformationType.PRIVATESECURITY.name
20- browser = self.getViewBrowser(snap, user=commercial_admin)
21+ browser = self.getViewBrowser(snap, user=admin)
22 browser.getLink("Administer snap package").click()
23 browser.getControl(name='field.project').value = "my-project"
24 browser.getControl("Require virtualized builders").selected = False
25@@ -750,10 +750,10 @@ class TestSnapAdminView(BaseTestSnapView):
26 # Cannot make snap private if it doesn't have a project associated.
27 login_person(self.person)
28 snap = self.factory.makeSnap(registrant=self.person)
29- commercial_admin = self.factory.makePerson(
30- member_of=[getUtility(ILaunchpadCelebrities).commercial_admin])
31+ admin = self.factory.makePerson(
32+ member_of=[getUtility(ILaunchpadCelebrities).admin])
33 private = InformationType.PRIVATESECURITY.name
34- browser = self.getViewBrowser(snap, user=commercial_admin)
35+ browser = self.getViewBrowser(snap, user=admin)
36 browser.getLink("Administer snap package").click()
37 browser.getControl(name='field.project').value = ''
38 browser.getControl(name="field.information_type").value = private
39@@ -776,10 +776,10 @@ class TestSnapAdminView(BaseTestSnapView):
40 information_type=InformationType.PRIVATESECURITY)
41 # Note that only LP admins or, in this case, commercial_admins
42 # can reach this snap because it's owned by a private team.
43- commercial_admin = self.factory.makePerson(
44- member_of=[getUtility(ILaunchpadCelebrities).commercial_admin])
45+ admin = self.factory.makePerson(
46+ member_of=[getUtility(ILaunchpadCelebrities).admin])
47 public = InformationType.PUBLIC.name
48- browser = self.getViewBrowser(snap, user=commercial_admin)
49+ browser = self.getViewBrowser(snap, user=admin)
50 browser.getLink("Administer snap package").click()
51 browser.getControl(name="field.information_type").value = public
52 browser.getControl("Update snap package").click()
53diff --git a/lib/lp/snappy/tests/test_snap.py b/lib/lp/snappy/tests/test_snap.py
54index 2a522f5..0c6f68e 100644
55--- a/lib/lp/snappy/tests/test_snap.py
56+++ b/lib/lp/snappy/tests/test_snap.py
57@@ -3029,8 +3029,7 @@ class TestSnapWebservice(TestCaseWithFactory):
58 ws_snaps = [
59 self.webservice.getAbsoluteUrl(api_url(snap))
60 for snap in snaps]
61- commercial_admin = (
62- getUtility(ILaunchpadCelebrities).commercial_admin.teamowner)
63+ admin = getUtility(ILaunchpadCelebrities).admin.teamowner
64 logout()
65
66 # Anonymous requests can only see public snaps.
67@@ -3063,16 +3062,16 @@ class TestSnapWebservice(TestCaseWithFactory):
68 [entry["self_link"] for entry in response.jsonBody()["entries"]])
69
70 # Admins can see all snaps.
71- commercial_admin_webservice = webservice_for_person(
72- commercial_admin, permission=OAuthPermission.READ_PRIVATE)
73- response = commercial_admin_webservice.named_get(
74+ admin_webservice = webservice_for_person(
75+ admin, permission=OAuthPermission.READ_PRIVATE)
76+ response = webservice.named_get(
77 "/+snaps", "findByOwner", owner=person_urls[0],
78 api_version="devel")
79 self.assertEqual(200, response.status)
80 self.assertContentEqual(
81 ws_snaps[:2],
82 [entry["self_link"] for entry in response.jsonBody()["entries"]])
83- response = commercial_admin_webservice.named_get(
84+ response = admin_webservice.named_get(
85 "/+snaps", "findByOwner", owner=person_urls[1],
86 api_version="devel")
87 self.assertEqual(200, response.status)