launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #04330
[Merge] lp:~wgrant/launchpad/destroy-beta-testers into lp:launchpad
William Grant has proposed merging lp:~wgrant/launchpad/destroy-beta-testers into lp:launchpad.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~wgrant/launchpad/destroy-beta-testers/+merge/68759
The edge redirection is long dead, so let's revoke launchpad-beta-testers' celebrity status.
--
https://code.launchpad.net/~wgrant/launchpad/destroy-beta-testers/+merge/68759
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/destroy-beta-testers into lp:launchpad.
=== modified file 'lib/canonical/launchpad/webapp/menu.py'
--- lib/canonical/launchpad/webapp/menu.py 2011-06-14 15:25:06 +0000
+++ lib/canonical/launchpad/webapp/menu.py 2011-07-21 23:14:27 +0000
@@ -242,8 +242,8 @@
_baseclassname = 'MenuBase'
_initialized = False
_forbiddenlinknames = set(
- ['user', 'initialize', 'links', 'enable_only', 'isBetaUser',
- 'iterlinks', 'initLink', 'updateLink', 'extra_attributes'])
+ ['user', 'initialize', 'links', 'enable_only', 'iterlinks',
+ 'initLink', 'updateLink', 'extra_attributes'])
def __init__(self, context):
# The attribute self.context is defined in IMenuBase.
=== modified file 'lib/canonical/launchpad/webapp/publisher.py'
--- lib/canonical/launchpad/webapp/publisher.py 2011-06-16 19:02:14 +0000
+++ lib/canonical/launchpad/webapp/publisher.py 2011-07-21 23:14:27 +0000
@@ -230,20 +230,6 @@
self._user = getUtility(ILaunchBag).user
return self._user
- _is_beta = None
-
- @property
- def isBetaUser(self):
- """Return True if the user is in the beta testers team."""
- if self._is_beta is not None:
- return self._is_beta
-
- # We cannot import ILaunchpadCelebrities here, so we will use the
- # hardcoded name of the beta testers team
- self._is_beta = self.user is not None and self.user.inTeam(
- 'launchpad-beta-testers')
- return self._is_beta
-
class LaunchpadView(UserAttributeCache):
"""Base class for views in Launchpad.
@@ -258,7 +244,6 @@
- render() <-- used to render the page. override this if you have
many templates not set via zcml, or you want to do
rendering from Python.
- - isBetaUser <-- whether the logged-in user is a beta tester
"""
def __init__(self, context, request):
=== modified file 'lib/lp/app/browser/tales.py'
--- lib/lp/app/browser/tales.py 2011-07-01 13:15:21 +0000
+++ lib/lp/app/browser/tales.py 2011-07-21 23:14:27 +0000
@@ -2483,8 +2483,6 @@
return self.pagetype()
elif name == 'show_actions_menu':
return self.show_actions_menu()
- elif name == 'isbetauser':
- return getattr(self.context, 'isBetaUser', False)
else:
raise TraversalError(name)
=== modified file 'lib/lp/app/doc/tales-macro.txt'
--- lib/lp/app/doc/tales-macro.txt 2011-06-23 13:10:40 +0000
+++ lib/lp/app/doc/tales-macro.txt 2011-07-21 23:14:27 +0000
@@ -43,21 +43,3 @@
>>> test_tales('view/macro:pagehas/portlets', view=view)
True
-
-
-The 'macro:isbetauser' can be used to safely try to determine if the
-current user is a beta user. It works for views that provide
-isBetaUser() (ie. all views inheriting LaunchpadView), and simply
-returns False for older views that do not.
-
- >>> class LPView(object):
- ... request = LaunchpadTestRequest()
- ... def isBetaUser(self):
- ... return True
-
- >>> test_tales('view/macro:isbetauser', view=LPView())
- True
-
- >>> test_tales('view/macro:isbetauser', view=view)
- False
-
=== modified file 'lib/lp/app/interfaces/launchpad.py'
--- lib/lp/app/interfaces/launchpad.py 2011-07-11 03:58:41 +0000
+++ lib/lp/app/interfaces/launchpad.py 2011-07-21 23:14:27 +0000
@@ -47,7 +47,6 @@
janitor = Attribute("The Launchpad Janitor.")
katie = Attribute("The Debian Auto-sync user.")
launchpad = Attribute("The Launchpad project.")
- launchpad_beta_testers = Attribute("The Launchpad Beta Testers team.")
launchpad_developers = Attribute("The Launchpad development team.")
obsolete_junk = Attribute("The Obsolete Junk project.")
ppa_key_guard = Attribute("The PPA signing keys owner.")
=== modified file 'lib/lp/app/utilities/celebrities.py'
--- lib/lp/app/utilities/celebrities.py 2011-07-11 03:49:12 +0000
+++ lib/lp/app/utilities/celebrities.py 2011-07-21 23:14:27 +0000
@@ -142,8 +142,6 @@
janitor = PersonCelebrityDescriptor('janitor')
katie = PersonCelebrityDescriptor('katie')
launchpad = CelebrityDescriptor(IProductSet, 'launchpad')
- launchpad_beta_testers = PersonCelebrityDescriptor(
- 'launchpad-beta-testers')
launchpad_developers = PersonCelebrityDescriptor('launchpad')
obsolete_junk = CelebrityDescriptor(IProductSet, 'obsolete-junk')
ppa_key_guard = PersonCelebrityDescriptor('ppa-key-guard')
=== modified file 'lib/lp/archiveuploader/tests/test_ppauploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_ppauploadprocessor.py 2011-06-16 10:00:35 +0000
+++ lib/lp/archiveuploader/tests/test_ppauploadprocessor.py 2011-07-21 23:14:27 +0000
@@ -22,7 +22,6 @@
from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
from canonical.launchpad.testing.fakepackager import FakePackager
from lp.app.errors import NotFoundError
-from lp.app.interfaces.launchpad import ILaunchpadCelebrities
from lp.archiveuploader.tests.test_uploadprocessor import (
TestUploadProcessorBase,
)
@@ -59,18 +58,9 @@
self.build_uploadprocessor = self.getUploadProcessor(
self.layer.txn, builds=True)
self.ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
- # Let's make 'name16' person member of 'launchpad-beta-tester'
- # team only in the context of this test.
- beta_testers = getUtility(
- ILaunchpadCelebrities).launchpad_beta_testers
- admin = getUtility(ILaunchpadCelebrities).admin
+
+ # create name16 PPA
self.name16 = getUtility(IPersonSet).getByName("name16")
- beta_testers.addMember(self.name16, admin)
- # Pop the two messages notifying the team modification.
- stub.test_emails.pop()
- stub.test_emails.pop()
-
- # create name16 PPA
self.name16_ppa = getUtility(IArchiveSet).new(
owner=self.name16, distribution=self.ubuntu,
purpose=ArchivePurpose.PPA)
=== modified file 'lib/lp/registry/doc/announcement.txt'
--- lib/lp/registry/doc/announcement.txt 2011-06-30 11:28:59 +0000
+++ lib/lp/registry/doc/announcement.txt 2011-07-21 23:14:27 +0000
@@ -27,19 +27,6 @@
>>> print mark.name
mark
-== Beta testers ==
-
-For the moment, this is only available to beta testers.
-
- >>> from canonical.launchpad.ftests import login, logout
- >>> login('foo.bar@xxxxxxxxxxxxx')
- >>> from lp.app.interfaces.launchpad import ILaunchpadCelebrities
- >>> beta = getUtility(ILaunchpadCelebrities).launchpad_beta_testers
- >>> ignored = beta.addMember(mark, mark)
- >>> from canonical.database.sqlbase import flush_database_updates
- >>> flush_database_updates()
- >>> logout()
-
== Creation ==
=== modified file 'lib/lp/registry/interfaces/role.py'
--- lib/lp/registry/interfaces/role.py 2011-07-11 03:58:41 +0000
+++ lib/lp/registry/interfaces/role.py 2011-07-21 23:14:27 +0000
@@ -94,9 +94,6 @@
in_katie = Bool(
title=_("True if this person is Katie."),
required=True, readonly=True)
- in_launchpad_beta_testers = Bool(
- title=_("True if this person is a Launchpad beta tester."),
- required=True, readonly=True)
in_launchpad_developers = Bool(
title=_("True if this person is a Launchpad developer."),
required=True, readonly=True)
=== modified file 'lib/lp/registry/stories/mailinglists/subscriptions.txt'
--- lib/lp/registry/stories/mailinglists/subscriptions.txt 2011-05-27 19:53:20 +0000
+++ lib/lp/registry/stories/mailinglists/subscriptions.txt 2011-07-21 23:14:27 +0000
@@ -182,25 +182,7 @@
on another team's mailing list at the same time that he requests
membership on the team.
-First, we need to make sure that Jdub is a member of the Beta Testers
-team. (Otherwise, the mailing list subscription checkbox won't show at
-all.)
-
- >>> from lp.app.interfaces.launchpad import ILaunchpadCelebrities
- >>> from lp.registry.interfaces.person import IPersonSet
- >>> from canonical.launchpad.ftests import login, logout
- >>> from zope.component import getUtility
- >>> login('foo.bar@xxxxxxxxxxxxx')
- >>> beta = getUtility(ILaunchpadCelebrities).launchpad_beta_testers
- >>> person_set = getUtility(IPersonSet)
- >>> jdub = person_set.getByName('jdub')
- >>> mark = person_set.getByName('mark')
- >>> ignored = beta.addMember(jdub, reviewer=mark)
- >>> from canonical.database.sqlbase import flush_database_updates
- >>> flush_database_updates()
- >>> logout()
-
-We also need to confirm that the desired team has a list to subscribe
+First we need to confirm that the desired team has a list to subscribe
to. We will use Carlos, as he is an administrator for the Rosetta
Admins team, and he should know if the list is available.
@@ -424,6 +406,12 @@
... default_batch_size: 1
... """)
>>> login('foo.bar@xxxxxxxxxxxxx')
+
+ >>> from lp.registry.interfaces.person import IPersonSet
+ >>> from zope.component import getUtility
+ >>> person_set = getUtility(IPersonSet)
+ >>> jdub = person_set.getByName('jdub')
+ >>> mark = person_set.getByName('mark')
>>> salgado = person_set.getByName('salgado')
>>> jordi = person_set.getByName('jordi')
>>> rosetta_admins = person_set.getByName('rosetta-admins')
=== modified file 'lib/lp/soyuz/doc/distroseriesqueue-dist-upgrader.txt'
--- lib/lp/soyuz/doc/distroseriesqueue-dist-upgrader.txt 2011-06-16 10:33:38 +0000
+++ lib/lp/soyuz/doc/distroseriesqueue-dist-upgrader.txt 2011-07-21 23:14:27 +0000
@@ -281,17 +281,11 @@
Custom uploads for PPAs should works as expected, i.e, publish its
files in the respective PPA location.
- >>> from lp.app.interfaces.launchpad import ILaunchpadCelebrities
>>> from lp.registry.interfaces.person import IPersonSet
>>> from lp.soyuz.enums import ArchivePurpose
>>> from lp.soyuz.interfaces.archive import IArchiveSet
- >>> beta_testers = getUtility(ILaunchpadCelebrities
- ... ).launchpad_beta_testers
- >>> admin = getUtility(ILaunchpadCelebrities).admin
>>> name16 = getUtility(IPersonSet).getByName("name16")
- >>> ignored = beta_testers.addMember(name16, admin)
-
>>> foobar_archive = getUtility(IArchiveSet).new(
... distribution=ubuntutest, purpose=ArchivePurpose.PPA,
... owner=name16)
