Merge launchpad:master into launchpad:db-devel

[Colin Watson]

Manually merge from master to fix tests with PostgreSQL 10 base image

Now that buildbot is on LXD with fresh base images, db-devel can't pass tests until https://code.launchpad.net/~twom/launchpad/+git/launchpad/+merge/391040 is merged.

[Colin Watson (cjwatson)]

review: Approve

diff --git a/lib/lp/archivepublisher/archivegpgsigningkey.py b/lib/lp/archivepublisher/archivegpgsigningkey.py
index a342332..20a4d79 100644
--- a/lib/lp/archivepublisher/archivegpgsigningkey.py
+++ b/lib/lp/archivepublisher/archivegpgsigningkey.py
@@ -37,17 +37,24 @@ from lp.archivepublisher.run_parts import (
 from lp.registry.interfaces.gpg import IGPGKeySet
 from lp.services.config import config
 from lp.services.features import getFeatureFlag
-from lp.services.gpg.interfaces import IGPGHandler
+from lp.services.gpg.interfaces import (
+    IGPGHandler,
+    IPymeKey,
+    )
 from lp.services.osutils import remove_if_exists
 from lp.services.propertycache import (
     cachedproperty,
     get_property_cache,
     )
 from lp.services.signing.enums import (
+    OpenPGPKeyAlgorithm,
     SigningKeyType,
     SigningMode,
     )
-from lp.services.signing.interfaces.signingkey import ISigningKeySet
+from lp.services.signing.interfaces.signingkey import (
+    ISigningKey,
+    ISigningKeySet,
+    )
 
 
 @implementer(ISignableArchive)
@@ -72,7 +79,7 @@ class SignableArchive:
     def can_sign(self):
         """See `ISignableArchive`."""
         return (
-            self.archive.signing_key is not None or
+            self.archive.signing_key_fingerprint is not None or
             self._run_parts_dir is not None)
 
     @cachedproperty
@@ -237,9 +244,9 @@ class ArchiveGPGSigningKey(SignableArchive):
         with open(export_path, 'wb') as export_file:
             export_file.write(key.export())
 
-    def generateSigningKey(self, log=None):
+    def generateSigningKey(self, log=None, async_keyserver=False):
         """See `IArchiveGPGSigningKey`."""
-        assert self.archive.signing_key is None, (
+        assert self.archive.signing_key_fingerprint is None, (
             "Cannot override signing_keys.")
 
         # Always generate signing keys for the default PPA, even if it
@@ -257,13 +264,26 @@ class ArchiveGPGSigningKey(SignableArchive):
 
         key_displayname = (
             "Launchpad PPA for %s" % self.archive.owner.displayname)
-        secret_key = getUtility(IGPGHandler).generateKey(
-            key_displayname, logger=log)
-        self._setupSigningKey(secret_key)
+        if getFeatureFlag(PUBLISHER_GPG_USES_SIGNING_SERVICE):
+            try:
+                signing_key = getUtility(ISigningKeySet).generate(
+                    SigningKeyType.OPENPGP, key_displayname,
+                    openpgp_key_algorithm=OpenPGPKeyAlgorithm.RSA, length=4096)
+            except Exception as e:
+                if log is not None:
+                    log.exception(
+                        "Error generating signing key for %s: %s %s" %
+                        (self.archive.reference, e.__class__.__name__, e))
+                raise
+        else:
+            signing_key = getUtility(IGPGHandler).generateKey(
+                key_displayname, logger=log)
+        return self._setupSigningKey(
+            signing_key, async_keyserver=async_keyserver)
 
     def setSigningKey(self, key_path, async_keyserver=False):
         """See `IArchiveGPGSigningKey`."""
-        assert self.archive.signing_key is None, (
+        assert self.archive.signing_key_fingerprint is None, (
             "Cannot override signing_keys.")
         assert os.path.exists(key_path), (
             "%s does not exist" % key_path)
@@ -274,34 +294,46 @@ class ArchiveGPGSigningKey(SignableArchive):
         return self._setupSigningKey(
             secret_key, async_keyserver=async_keyserver)
 
-    def _uploadPublicSigningKey(self, secret_key):
+    def _uploadPublicSigningKey(self, signing_key):
         """Upload the public half of a signing key to the keyserver."""
         # The handler's security proxying doesn't protect anything useful
         # here, and when we're running in a thread we don't have an
         # interaction.
         gpghandler = removeSecurityProxy(getUtility(IGPGHandler))
-        pub_key = gpghandler.retrieveKey(secret_key.fingerprint)
-        gpghandler.uploadPublicKey(pub_key.fingerprint)
-        return pub_key
+        if IPymeKey.providedBy(signing_key):
+            pub_key = gpghandler.retrieveKey(signing_key.fingerprint)
+            gpghandler.uploadPublicKey(pub_key.fingerprint)
+            return pub_key
+        else:
+            assert ISigningKey.providedBy(signing_key)
+            gpghandler.submitKey(removeSecurityProxy(signing_key).public_key)
+            return signing_key
 
     def _storeSigningKey(self, pub_key):
         """Store signing key reference in the database."""
         key_owner = getUtility(ILaunchpadCelebrities).ppa_key_guard
-        key, _ = getUtility(IGPGKeySet).activate(
-            key_owner, pub_key, pub_key.can_encrypt)
-        self.archive.signing_key_owner = key.owner
+        if IPymeKey.providedBy(pub_key):
+            key, _ = getUtility(IGPGKeySet).activate(
+                key_owner, pub_key, pub_key.can_encrypt)
+        else:
+            assert ISigningKey.providedBy(pub_key)
+            key = pub_key
+        self.archive.signing_key_owner = key_owner
         self.archive.signing_key_fingerprint = key.fingerprint
         del get_property_cache(self.archive).signing_key
 
-    def _setupSigningKey(self, secret_key, async_keyserver=False):
+    def _setupSigningKey(self, signing_key, async_keyserver=False):
         """Mandatory setup for signing keys.
 
-        * Export the secret key into the protected disk location.
+        * Export the secret key into the protected disk location (for
+          locally-generated keys).
         * Upload public key to the keyserver.
-        * Store the public GPGKey reference in the database and update
-          the context archive.signing_key.
+        * Store the public GPGKey reference in the database (for
+          locally-generated keys) and update the context
+          archive.signing_key.
         """
-        self.exportSecretKey(secret_key)
+        if IPymeKey.providedBy(signing_key):
+            self.exportSecretKey(signing_key)
         if async_keyserver:
             # If we have an asynchronous keyserver running in the current
             # thread using Twisted, then we need some contortions to ensure
@@ -310,10 +342,10 @@ class ArchiveGPGSigningKey(SignableArchive):
             # Since that thread won't have a Zope interaction, we need to
             # unwrap the security proxy for it.
             d = deferToThread(
-                self._uploadPublicSigningKey, removeSecurityProxy(secret_key))
+                self._uploadPublicSigningKey, removeSecurityProxy(signing_key))
             d.addCallback(ProxyFactory)
             d.addCallback(self._storeSigningKey)
             return d
         else:
-            pub_key = self._uploadPublicSigningKey(secret_key)
+            pub_key = self._uploadPublicSigningKey(signing_key)
             self._storeSigningKey(pub_key)
diff --git a/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py b/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py
index 87359e8..67366bd 100644
--- a/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py
+++ b/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py
@@ -14,8 +14,15 @@ from testtools.matchers import (
     FileContains,
     StartsWith,
     )
-from testtools.twistedsupport import AsynchronousDeferredRunTest
-from twisted.internet import defer
+from testtools.twistedsupport import (
+    AsynchronousDeferredRunTest,
+    AsynchronousDeferredRunTestForBrokenTwisted,
+    )
+import treq
+from twisted.internet import (
+    defer,
+    reactor,
+    )
 from zope.component import getUtility
 
 from lp.archivepublisher.config import getPubConfig
@@ -26,18 +33,27 @@ from lp.archivepublisher.interfaces.archivegpgsigningkey import (
     )
 from lp.archivepublisher.interfaces.publisherconfig import IPublisherConfigSet
 from lp.archivepublisher.tests.test_run_parts import RunPartsMixin
+from lp.registry.interfaces.gpg import IGPGKeySet
 from lp.services.compat import mock
 from lp.services.features.testing import FeatureFixture
+from lp.services.gpg.interfaces import IGPGHandler
+from lp.services.gpg.tests.test_gpghandler import FakeGenerateKey
 from lp.services.log.logger import BufferLogger
 from lp.services.osutils import write_file
 from lp.services.signing.enums import (
     SigningKeyType,
     SigningMode,
     )
+from lp.services.signing.interfaces.signingkey import ISigningKeySet
 from lp.services.signing.tests.helpers import SigningServiceClientFixture
+from lp.services.twistedsupport.testing import TReqFixture
+from lp.services.twistedsupport.treq import check_status
 from lp.soyuz.enums import ArchivePurpose
 from lp.testing import TestCaseWithFactory
-from lp.testing.gpgkeys import gpgkeysdir
+from lp.testing.gpgkeys import (
+    gpgkeysdir,
+    test_pubkey_from_email,
+    )
 from lp.testing.keyserver import InProcessKeyServerFixture
 from lp.testing.layers import ZopelessDatabaseLayer
 
@@ -271,3 +287,89 @@ class TestSignableArchiveWithRunParts(RunPartsMixin, TestCaseWithFactory):
             FileContains(
                 "detached signature of %s (%s, %s/%s)\n" %
                 (filename, self.archive_root, self.distro.name, self.suite)))
+
+
+class TestArchiveGPGSigningKey(TestCaseWithFactory):
+
+    layer = ZopelessDatabaseLayer
+    # treq.content doesn't close the connection before yielding control back
+    # to the test, so we need to spin the reactor at the end to finish
+    # things off.
+    run_tests_with = AsynchronousDeferredRunTestForBrokenTwisted.make_factory(
+        timeout=10000)
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        super(TestArchiveGPGSigningKey, self).setUp()
+        self.temp_dir = self.makeTemporaryDirectory()
+        self.pushConfig("personalpackagearchive", root=self.temp_dir)
+        self.keyserver = self.useFixture(InProcessKeyServerFixture())
+        yield self.keyserver.start()
+
+    @defer.inlineCallbacks
+    def test_generateSigningKey_local(self):
+        # Generating a signing key locally using GPGHandler stores it in the
+        # database and pushes it to the keyserver.
+        self.useFixture(FakeGenerateKey("[e-mail]"))
+        logger = BufferLogger()
+        # Use a display name that matches the pregenerated sample key.
+        owner = self.factory.makePerson(
+            displayname="Celso \xe1\xe9\xed\xf3\xfa Providelo")
+        archive = self.factory.makeArchive(owner=owner)
+        yield IArchiveGPGSigningKey(archive).generateSigningKey(
+            log=logger, async_keyserver=True)
+        # The key is stored in the database.
+        self.assertIsNotNone(archive.signing_key_owner)
+        self.assertIsNotNone(archive.signing_key_fingerprint)
+        # The key is stored as a GPGKey, not a SigningKey.
+        self.assertIsNotNone(
+            getUtility(IGPGKeySet).getByFingerprint(
+                archive.signing_key_fingerprint))
+        self.assertIsNone(
+            getUtility(ISigningKeySet).get(
+                SigningKeyType.OPENPGP, archive.signing_key_fingerprint))
+        # The key is uploaded to the keyserver.
+        client = self.useFixture(TReqFixture(reactor)).client
+        response = yield client.get(
+            getUtility(IGPGHandler).getURLForKeyInServer(
+                archive.signing_key_fingerprint, "get"))
+        yield check_status(response)
+        content = yield treq.content(response)
+        self.assertIn(b"-----BEGIN PGP PUBLIC KEY BLOCK-----\n", content)
+
+    @defer.inlineCallbacks
+    def test_generateSigningKey_signing_service(self):
+        # Generating a signing key on the signing service stores it in the
+        # database and pushes it to the keyserver.
+        self.useFixture(
+            FeatureFixture({PUBLISHER_GPG_USES_SIGNING_SERVICE: "on"}))
+        signing_service_client = self.useFixture(
+            SigningServiceClientFixture(self.factory))
+        signing_service_client.generate.side_effect = None
+        test_key = test_pubkey_from_email("[e-mail]")
+        signing_service_client.generate.return_value = {
+            "fingerprint": "33C0A61893A5DC5EB325B29E415A12CAC2F30234",
+            "public-key": test_key,
+            }
+        logger = BufferLogger()
+        archive = self.factory.makeArchive()
+        yield IArchiveGPGSigningKey(archive).generateSigningKey(
+            log=logger, async_keyserver=True)
+        # The key is stored in the database.
+        self.assertIsNotNone(archive.signing_key_owner)
+        self.assertIsNotNone(archive.signing_key_fingerprint)
+        # The key is stored as a SigningKey, not a GPGKey.
+        self.assertIsNone(
+            getUtility(IGPGKeySet).getByFingerprint(
+                archive.signing_key_fingerprint))
+        signing_key = getUtility(ISigningKeySet).get(
+            SigningKeyType.OPENPGP, archive.signing_key_fingerprint)
+        self.assertEqual(test_key, signing_key.public_key)
+        # The key is uploaded to the keyserver.
+        client = self.useFixture(TReqFixture(reactor)).client
+        response = yield client.get(
+            getUtility(IGPGHandler).getURLForKeyInServer(
+                archive.signing_key_fingerprint, "get"))
+        yield check_status(response)
+        content = yield treq.content(response)
+        self.assertIn(test_key, content)
diff --git a/lib/lp/blueprints/browser/sprint.py b/lib/lp/blueprints/browser/sprint.py
index aae704a..da94d43 100644
--- a/lib/lp/blueprints/browser/sprint.py
+++ b/lib/lp/blueprints/browser/sprint.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Sprint views."""
@@ -27,8 +27,8 @@ from collections import defaultdict
 import csv
 
 from lazr.restful.utils import smartquote
-import six
 import pytz
+import six
 from zope.component import getUtility
 from zope.formlib.widget import CustomWidgetFactory
 from zope.formlib.widgets import TextAreaWidget
@@ -462,6 +462,7 @@ class SprintTopicSetView(HasSpecificationsView, LaunchpadView):
             # only a single item was selected, but we want to deal with a
             # list for the general case, so convert it to a list
             selected_specs = [selected_specs]
+        selected_specs = [int(speclink) for speclink in selected_specs]
 
         if action == 'Accepted':
             action_fn = self.context.acceptSpecificationLinks
diff --git a/lib/lp/blueprints/browser/tests/test_views.py b/lib/lp/blueprints/browser/tests/test_views.py
index 5b68b37..cbbe2e5 100644
--- a/lib/lp/blueprints/browser/tests/test_views.py
+++ b/lib/lp/blueprints/browser/tests/test_views.py
@@ -110,7 +110,8 @@ def test_suite():
     for filename in filenames:
         path = filename
         one_test = LayeredDocFileSuite(
-            path, setUp=setUp, tearDown=tearDown,
+            path,
+            setUp=lambda test: setUp(test, future=True), tearDown=tearDown,
             layer=DatabaseFunctionalLayer,
             stdout_logging_level=logging.WARNING)
         suite.addTest(one_test)
diff --git a/lib/lp/blueprints/model/specification.py b/lib/lp/blueprints/model/specification.py
index 40cf6ab..4b37d10 100644
--- a/lib/lp/blueprints/model/specification.py
+++ b/lib/lp/blueprints/model/specification.py
@@ -23,14 +23,15 @@ from sqlobject import (
     SQLRelatedJoin,
     StringCol,
     )
-from storm.expr import (
+from storm.locals import (
     Count,
     Desc,
     Join,
     Or,
+    ReferenceSet,
     SQL,
+    Store,
     )
-from storm.store import Store
 from zope.component import getUtility
 from zope.event import notify
 from zope.interface import implementer
@@ -237,11 +238,13 @@ class Specification(SQLBase, BugLinkTargetMixin, InformationTypeMixin):
         joinColumn='specification', otherColumn='person',
         intermediateTable='SpecificationSubscription',
         orderBy=['display_name', 'name'])
-    sprint_links = SQLMultipleJoin('SprintSpecification', orderBy='id',
-        joinColumn='specification')
-    sprints = SQLRelatedJoin('Sprint', orderBy='name',
-        joinColumn='specification', otherColumn='sprint',
-        intermediateTable='SprintSpecification')
+    sprint_links = ReferenceSet(
+        '<primary key>', 'SprintSpecification.specification_id',
+        order_by='SprintSpecification.id')
+    sprints = ReferenceSet(
+        '<primary key>', 'SprintSpecification.specification_id',
+        'SprintSpecification.sprint_id', 'Sprint.id',
+        order_by='Sprint.name')
     spec_dependency_links = SQLMultipleJoin('SpecificationDependency',
         joinColumn='specification', orderBy='id')
 
@@ -827,13 +830,11 @@ class Specification(SQLBase, BugLinkTargetMixin, InformationTypeMixin):
 
     def unlinkSprint(self, sprint):
         """See ISpecification."""
-        from lp.blueprints.model.sprintspecification import (
-            SprintSpecification)
         for sprint_link in self.sprint_links:
             # sprints have unique names
             if sprint_link.sprint.name == sprint.name:
-                SprintSpecification.delete(sprint_link.id)
-                return sprint_link
+                sprint_link.destroySelf()
+                return
 
     # dependencies
     def createDependency(self, specification):
@@ -1060,8 +1061,8 @@ class SpecificationSet(HasSpecificationsMixin):
     def coming_sprints(self):
         """See ISpecificationSet."""
         from lp.blueprints.model.sprint import Sprint
-        return Sprint.select("time_ends > 'NOW'", orderBy='time_starts',
-            limit=5)
+        rows = IStore(Sprint).find(Sprint, Sprint.time_ends > UTC_NOW)
+        return rows.order_by(Sprint.time_starts).config(limit=5)
 
     def new(self, name, title, specurl, summary, definition_status,
             owner, target, approver=None, assignee=None, drafter=None,
diff --git a/lib/lp/blueprints/model/sprint.py b/lib/lp/blueprints/model/sprint.py
index 2446437..ed6748a 100644
--- a/lib/lp/blueprints/model/sprint.py
+++ b/lib/lp/blueprints/model/sprint.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2017 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -8,17 +8,17 @@ __all__ = [
     'HasSprintsMixin',
     ]
 
-
-from sqlobject import (
-    BoolCol,
-    ForeignKey,
-    StringCol,
-    )
+import pytz
 from storm.locals import (
+    Bool,
+    DateTime,
     Desc,
+    Int,
     Join,
     Or,
+    Reference,
     Store,
+    Unicode,
     )
 from zope.component import getUtility
 from zope.interface import implementer
@@ -38,7 +38,10 @@ from lp.blueprints.interfaces.sprint import (
     ISprint,
     ISprintSet,
     )
-from lp.blueprints.model.specification import HasSpecificationsMixin
+from lp.blueprints.model.specification import (
+    HasSpecificationsMixin,
+    Specification,
+    )
 from lp.blueprints.model.specificationsearch import (
     get_specification_active_product_filter,
     get_specification_filters,
@@ -51,46 +54,66 @@ from lp.registry.interfaces.person import (
     validate_public_person,
     )
 from lp.registry.model.hasdrivers import HasDriversMixin
-from lp.services.database.constants import DEFAULT
-from lp.services.database.datetimecol import UtcDateTimeCol
-from lp.services.database.sqlbase import (
-    flush_database_updates,
-    quote,
-    SQLBase,
+from lp.services.database.constants import (
+    DEFAULT,
+    UTC_NOW,
     )
+from lp.services.database.interfaces import IStore
+from lp.services.database.sqlbase import flush_database_updates
+from lp.services.database.stormbase import StormBase
 from lp.services.propertycache import cachedproperty
 
 
 @implementer(ISprint, IHasLogo, IHasMugshot, IHasIcon)
-class Sprint(SQLBase, HasDriversMixin, HasSpecificationsMixin):
+class Sprint(StormBase, HasDriversMixin, HasSpecificationsMixin):
     """See `ISprint`."""
 
-    _defaultOrder = ['name']
+    __storm_table__ = 'Sprint'
+    __storm_order__ = ['name']
 
     # db field names
-    owner = ForeignKey(
-        dbName='owner', foreignKey='Person',
-        storm_validator=validate_public_person, notNull=True)
-    name = StringCol(notNull=True, alternateID=True)
-    title = StringCol(notNull=True)
-    summary = StringCol(notNull=True)
-    driver = ForeignKey(
-        dbName='driver', foreignKey='Person',
-        storm_validator=validate_public_person)
-    home_page = StringCol(notNull=False, default=None)
-    homepage_content = StringCol(default=None)
-    icon = ForeignKey(
-        dbName='icon', foreignKey='LibraryFileAlias', default=None)
-    logo = ForeignKey(
-        dbName='logo', foreignKey='LibraryFileAlias', default=None)
-    mugshot = ForeignKey(
-        dbName='mugshot', foreignKey='LibraryFileAlias', default=None)
-    address = StringCol(notNull=False, default=None)
-    datecreated = UtcDateTimeCol(notNull=True, default=DEFAULT)
-    time_zone = StringCol(notNull=True)
-    time_starts = UtcDateTimeCol(notNull=True)
-    time_ends = UtcDateTimeCol(notNull=True)
-    is_physical = BoolCol(notNull=True, default=True)
+    id = Int(primary=True)
+    owner_id = Int(
+        name='owner', validator=validate_public_person, allow_none=False)
+    owner = Reference(owner_id, 'Person.id')
+    name = Unicode(allow_none=False)
+    title = Unicode(allow_none=False)
+    summary = Unicode(allow_none=False)
+    driver_id = Int(name='driver', validator=validate_public_person)
+    driver = Reference(driver_id, 'Person.id')
+    home_page = Unicode(allow_none=True, default=None)
+    homepage_content = Unicode(default=None)
+    icon_id = Int(name='icon', default=None)
+    icon = Reference(icon_id, 'LibraryFileAlias.id')
+    logo_id = Int(name='logo', default=None)
+    logo = Reference(logo_id, 'LibraryFileAlias.id')
+    mugshot_id = Int(name='mugshot', default=None)
+    mugshot = Reference(mugshot_id, 'LibraryFileAlias.id')
+    address = Unicode(allow_none=True, default=None)
+    datecreated = DateTime(tzinfo=pytz.UTC, allow_none=False, default=DEFAULT)
+    time_zone = Unicode(allow_none=False)
+    time_starts = DateTime(tzinfo=pytz.UTC, allow_none=False)
+    time_ends = DateTime(tzinfo=pytz.UTC, allow_none=False)
+    is_physical = Bool(allow_none=False, default=True)
+
+    def __init__(self, owner, name, title, time_zone, time_starts, time_ends,
+                 summary, address=None, driver=None, home_page=None,
+                 mugshot=None, logo=None, icon=None, is_physical=True):
+        super(Sprint, self).__init__()
+        self.owner = owner
+        self.name = name
+        self.title = title
+        self.time_zone = time_zone
+        self.time_starts = time_starts
+        self.time_ends = time_ends
+        self.summary = summary
+        self.address = address
+        self.driver = driver
+        self.home_page = home_page
+        self.mugshot = mugshot
+        self.logo = logo
+        self.icon = icon
+        self.is_physical = is_physical
 
     # attributes
 
@@ -128,7 +151,7 @@ class Sprint(SQLBase, HasDriversMixin, HasSpecificationsMixin):
         tables.append(Join(
             SprintSpecification,
             SprintSpecification.specification == Specification.id))
-        query.append(SprintSpecification.sprintID == self.id)
+        query.append(SprintSpecification.sprint == self)
 
         if not filter:
             # filter could be None or [] then we decide the default
@@ -209,7 +232,7 @@ class Sprint(SQLBase, HasDriversMixin, HasSpecificationsMixin):
         context. Here we are a sprint that could cover many products and/or
         distros.
         """
-        speclink = SprintSpecification.get(speclink_id)
+        speclink = Store.of(self).get(SprintSpecification, speclink_id)
         assert (speclink.sprint.id == self.id)
         return speclink
 
@@ -303,15 +326,16 @@ class SprintSet:
 
     def __getitem__(self, name):
         """See `ISprintSet`."""
-        return Sprint.selectOneBy(name=name)
+        return IStore(Sprint).find(Sprint, name=name).one()
 
     def __iter__(self):
         """See `ISprintSet`."""
-        return iter(Sprint.select("time_ends > 'NOW'", orderBy='time_starts'))
+        return iter(IStore(Sprint).find(
+            Sprint, Sprint.time_ends > UTC_NOW).order_by(Sprint.time_starts))
 
     @property
     def all(self):
-        return Sprint.select(orderBy='-time_starts')
+        return IStore(Sprint).find(Sprint).order_by(Sprint.time_starts)
 
     def new(self, owner, name, title, time_zone, time_starts, time_ends,
             summary, address=None, driver=None, home_page=None,
@@ -329,48 +353,50 @@ class HasSprintsMixin:
     implementing IHasSprints.
     """
 
-    def _getBaseQueryAndClauseTablesForQueryingSprints(self):
-        """Return the base SQL query and the clauseTables to be used when
-        querying sprints related to this object.
+    def _getBaseClausesForQueryingSprints(self):
+        """Return the base Storm clauses to be used when querying sprints
+        related to this object.
 
         Subclasses must overwrite this method if it doesn't suit them.
         """
-        query = """
-            Specification.%s = %s
-            AND Specification.id = SprintSpecification.specification
-            AND SprintSpecification.sprint = Sprint.id
-            AND SprintSpecification.status = %s
-            """ % (self._table, self.id,
-                   quote(SprintSpecificationStatus.ACCEPTED))
-        return query, ['Specification', 'SprintSpecification']
+        try:
+            table = getattr(self, "__storm_table__")
+        except AttributeError:
+            # XXX cjwatson 2020-09-10: Remove this once all inheritors have
+            # been converted from SQLObject to Storm.
+            table = getattr(self, "_table")
+        return [
+            getattr(Specification, table.lower()) == self,
+            Specification.id == SprintSpecification.specification_id,
+            SprintSpecification.sprint == Sprint.id,
+            SprintSpecification.status == SprintSpecificationStatus.ACCEPTED,
+            ]
 
     def getSprints(self):
-        query, tables = self._getBaseQueryAndClauseTablesForQueryingSprints()
-        return Sprint.select(
-            query, clauseTables=tables, orderBy='-time_starts', distinct=True)
+        clauses = self._getBaseClausesForQueryingSprints()
+        return IStore(Sprint).find(Sprint, *clauses).order_by(
+            Desc(Sprint.time_starts)).config(distinct=True)
 
     @cachedproperty
     def sprints(self):
         """See IHasSprints."""
         return list(self.getSprints())
 
-    def getComingSprings(self):
-        query, tables = self._getBaseQueryAndClauseTablesForQueryingSprints()
-        query += " AND Sprint.time_ends > 'NOW'"
-        return Sprint.select(
-            query, clauseTables=tables, orderBy='time_starts',
-            distinct=True, limit=5)
+    def getComingSprints(self):
+        clauses = self._getBaseClausesForQueryingSprints()
+        clauses.append(Sprint.time_ends > UTC_NOW)
+        return IStore(Sprint).find(Sprint, *clauses).order_by(
+            Sprint.time_starts).config(distinct=True, limit=5)
 
     @cachedproperty
     def coming_sprints(self):
         """See IHasSprints."""
-        return list(self.getComingSprings())
+        return list(self.getComingSprints())
 
     @property
     def past_sprints(self):
         """See IHasSprints."""
-        query, tables = self._getBaseQueryAndClauseTablesForQueryingSprints()
-        query += " AND Sprint.time_ends <= 'NOW'"
-        return Sprint.select(
-            query, clauseTables=tables, orderBy='-time_starts',
-            distinct=True)
+        clauses = self._getBaseClausesForQueryingSprints()
+        clauses.append(Sprint.time_ends <= UTC_NOW)
+        return IStore(Sprint).find(Sprint, *clauses).order_by(
+            Desc(Sprint.time_starts)).config(distinct=True)
diff --git a/lib/lp/blueprints/model/sprintspecification.py b/lib/lp/blueprints/model/sprintspecification.py
index 46e691a..eed7649 100644
--- a/lib/lp/blueprints/model/sprintspecification.py
+++ b/lib/lp/blueprints/model/sprintspecification.py
@@ -1,13 +1,17 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
 
 __all__ = ['SprintSpecification']
 
-from sqlobject import (
-    ForeignKey,
-    StringCol,
+import pytz
+from storm.locals import (
+    DateTime,
+    Int,
+    Reference,
+    Store,
+    Unicode,
     )
 from zope.interface import implementer
 
@@ -18,32 +22,41 @@ from lp.services.database.constants import (
     DEFAULT,
     UTC_NOW,
     )
-from lp.services.database.datetimecol import UtcDateTimeCol
-from lp.services.database.enumcol import EnumCol
-from lp.services.database.sqlbase import SQLBase
+from lp.services.database.enumcol import DBEnum
+from lp.services.database.stormbase import StormBase
 
 
 @implementer(ISprintSpecification)
-class SprintSpecification(SQLBase):
+class SprintSpecification(StormBase):
     """A link between a sprint and a specification."""
 
-    _table = 'SprintSpecification'
+    __storm_table__ = 'SprintSpecification'
 
-    sprint = ForeignKey(dbName='sprint', foreignKey='Sprint',
-        notNull=True)
-    specification = ForeignKey(dbName='specification',
-        foreignKey='Specification', notNull=True)
-    status = EnumCol(schema=SprintSpecificationStatus, notNull=True,
+    id = Int(primary=True)
+
+    sprint_id = Int(name='sprint', allow_none=False)
+    sprint = Reference(sprint_id, 'Sprint.id')
+    specification_id = Int(name='specification', allow_none=False)
+    specification = Reference(specification_id, 'Specification.id')
+    status = DBEnum(
+        enum=SprintSpecificationStatus, allow_none=False,
         default=SprintSpecificationStatus.PROPOSED)
-    whiteboard = StringCol(notNull=False, default=None)
-    registrant = ForeignKey(
-        dbName='registrant', foreignKey='Person',
-        storm_validator=validate_public_person, notNull=True)
-    date_created = UtcDateTimeCol(notNull=True, default=DEFAULT)
-    decider = ForeignKey(
-        dbName='decider', foreignKey='Person',
-        storm_validator=validate_public_person, notNull=False, default=None)
-    date_decided = UtcDateTimeCol(notNull=False, default=None)
+    whiteboard = Unicode(allow_none=True, default=None)
+    registrant_id = Int(
+        name='registrant', validator=validate_public_person, allow_none=False)
+    registrant = Reference(registrant_id, 'Person.id')
+    date_created = DateTime(tzinfo=pytz.UTC, allow_none=False, default=DEFAULT)
+    decider_id = Int(
+        name='decider', validator=validate_public_person, allow_none=True,
+        default=None)
+    decider = Reference(decider_id, 'Person.id')
+    date_decided = DateTime(tzinfo=pytz.UTC, allow_none=True, default=None)
+
+    def __init__(self, sprint, specification, registrant):
+        super(SprintSpecification, self).__init__()
+        self.sprint = sprint
+        self.specification = specification
+        self.registrant = registrant
 
     @property
     def is_confirmed(self):
@@ -66,3 +79,6 @@ class SprintSpecification(SQLBase):
         self.status = SprintSpecificationStatus.DECLINED
         self.decider = decider
         self.date_decided = UTC_NOW
+
+    def destroySelf(self):
+        Store.of(self).remove(self)
diff --git a/lib/lp/blueprints/vocabularies/sprint.py b/lib/lp/blueprints/vocabularies/sprint.py
index f300b62..f98df43 100644
--- a/lib/lp/blueprints/vocabularies/sprint.py
+++ b/lib/lp/blueprints/vocabularies/sprint.py
@@ -9,21 +9,17 @@ __all__ = [
     'SprintVocabulary',
     ]
 
-
 from lp.blueprints.model.sprint import Sprint
-from lp.services.webapp.vocabulary import NamedSQLObjectVocabulary
+from lp.services.database.constants import UTC_NOW
+from lp.services.webapp.vocabulary import NamedStormVocabulary
 
 
-class FutureSprintVocabulary(NamedSQLObjectVocabulary):
+class FutureSprintVocabulary(NamedStormVocabulary):
     """A vocab of all sprints that have not yet finished."""
 
     _table = Sprint
-
-    def __iter__(self):
-        future_sprints = Sprint.select("time_ends > 'NOW'")
-        for sprint in future_sprints:
-            yield(self.toTerm(sprint))
+    _clauses = [Sprint.time_ends > UTC_NOW]
 
 
-class SprintVocabulary(NamedSQLObjectVocabulary):
+class SprintVocabulary(NamedStormVocabulary):
     _table = Sprint
diff --git a/lib/lp/code/mail/tests/test_codehandler.py b/lib/lp/code/mail/tests/test_codehandler.py
index a02cc4d..97feda0 100644
--- a/lib/lp/code/mail/tests/test_codehandler.py
+++ b/lib/lp/code/mail/tests/test_codehandler.py
@@ -3,6 +3,8 @@
 
 """Testing the CodeHandler."""
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 __metaclass__ = type
 
 from textwrap import dedent
diff --git a/lib/lp/code/mail/tests/test_codereviewcomment.py b/lib/lp/code/mail/tests/test_codereviewcomment.py
index 930753e..a692a97 100644
--- a/lib/lp/code/mail/tests/test_codereviewcomment.py
+++ b/lib/lp/code/mail/tests/test_codereviewcomment.py
@@ -243,7 +243,7 @@ class TestCodeReviewComment(TestCaseWithFactory):
     def test_generateEmailWithVoteAndTag(self):
         """Ensure that vote tags are displayed."""
         mailer, subscriber = self.makeMailer(
-            vote=CodeReviewVote.APPROVE, vote_tag='DBTAG')
+            vote=CodeReviewVote.APPROVE, vote_tag=u'DBTAG')
         ctrl = mailer.generateEmail(
             subscriber.preferredemail.email, subscriber)
         self.assertEqual('Review: Approve dbtag', ctrl.body.splitlines()[0])
diff --git a/lib/lp/code/model/branchcollection.py b/lib/lp/code/model/branchcollection.py
index 7482778..bc3a026 100644
--- a/lib/lp/code/model/branchcollection.py
+++ b/lib/lp/code/model/branchcollection.py
@@ -484,10 +484,10 @@ class GenericBranchCollection:
         tables = [
             BranchMergeProposal,
             Join(CodeReviewVoteReference,
-                 CodeReviewVoteReference.branch_merge_proposalID == \
+                 CodeReviewVoteReference.branch_merge_proposal ==
                  BranchMergeProposal.id),
             LeftJoin(CodeReviewComment,
-                 CodeReviewVoteReference.commentID == CodeReviewComment.id)]
+                 CodeReviewVoteReference.comment == CodeReviewComment.id)]
 
         expressions = [
             CodeReviewVoteReference.reviewer == reviewer,
diff --git a/lib/lp/code/model/branchmergeproposal.py b/lib/lp/code/model/branchmergeproposal.py
index 338cc29..2a346b4 100644
--- a/lib/lp/code/model/branchmergeproposal.py
+++ b/lib/lp/code/model/branchmergeproposal.py
@@ -46,6 +46,7 @@ from zope.interface import implementer
 from zope.security.interfaces import Unauthorized
 
 from lp.app.enums import PRIVATE_INFORMATION_TYPES
+from lp.app.errors import NotFoundError
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 from lp.bugs.interfaces.bugtask import IBugTaskSet
 from lp.bugs.interfaces.bugtaskfilter import filter_bugtasks_by_context
@@ -565,11 +566,14 @@ class BranchMergeProposal(SQLBase, BugLinkTargetMixin):
     @property
     def all_comments(self):
         """See `IBranchMergeProposal`."""
-        return CodeReviewComment.selectBy(branch_merge_proposal=self.id)
+        return IStore(CodeReviewComment).find(
+            CodeReviewComment, branch_merge_proposal=self)
 
     def getComment(self, id):
         """See `IBranchMergeProposal`."""
-        comment = CodeReviewComment.get(id)
+        comment = IStore(CodeReviewComment).get(CodeReviewComment, id)
+        if comment is None:
+            raise NotFoundError(id)
         if comment.branch_merge_proposal != self:
             raise WrongBranchMergeProposal
         return comment
@@ -583,7 +587,10 @@ class BranchMergeProposal(SQLBase, BugLinkTargetMixin):
 
     def setCommentVisibility(self, user, comment_number, visible):
         """See `IBranchMergeProposal`."""
-        comment = CodeReviewComment.get(comment_number)
+        comment = IStore(CodeReviewComment).get(
+            CodeReviewComment, comment_number)
+        if comment is None:
+            raise NotFoundError(comment_number)
         if comment.branch_merge_proposal != self:
             raise WrongBranchMergeProposal
         if not comment.userCanSetCommentVisibility(user):
@@ -596,7 +603,9 @@ class BranchMergeProposal(SQLBase, BugLinkTargetMixin):
         """See `IBranchMergeProposal`.
 
         This function can raise WrongBranchMergeProposal."""
-        vote = CodeReviewVoteReference.get(id)
+        vote = IStore(CodeReviewVoteReference).get(CodeReviewVoteReference, id)
+        if vote is None:
+            raise NotFoundError(id)
         if vote.branch_merge_proposal != self:
             raise WrongBranchMergeProposal
         return vote
@@ -932,6 +941,7 @@ class BranchMergeProposal(SQLBase, BugLinkTargetMixin):
                 date_created=_date_created)
             self._ensureAssociatedBranchesVisibleToReviewer(reviewer)
         vote_reference.review_type = review_type
+        Store.of(vote_reference).flush()
         if _notify_listeners:
             notify(ReviewerNominatedEvent(vote_reference))
         return vote_reference
@@ -1098,11 +1108,13 @@ class BranchMergeProposal(SQLBase, BugLinkTargetMixin):
             if team_ref is not None:
                 return team_ref
         # Create a new reference.
-        return CodeReviewVoteReference(
+        vote_reference = CodeReviewVoteReference(
             branch_merge_proposal=self,
             registrant=user,
             reviewer=user,
             review_type=review_type)
+        Store.of(vote_reference).flush()
+        return vote_reference
 
     def createCommentFromMessage(self, message, vote, review_type,
                                  original_email, _notify_listeners=True,
@@ -1126,6 +1138,7 @@ class BranchMergeProposal(SQLBase, BugLinkTargetMixin):
             vote_reference.reviewer = message.owner
             vote_reference.review_type = review_type
             vote_reference.comment = code_review_message
+        Store.of(code_review_message).flush()
         if _notify_listeners:
             notify(ObjectCreatedEvent(code_review_message))
         return code_review_message
@@ -1389,15 +1402,15 @@ class BranchMergeProposal(SQLBase, BugLinkTargetMixin):
         if include_votes:
             votes = load_referencing(
                 CodeReviewVoteReference, branch_merge_proposals,
-                ['branch_merge_proposalID'])
+                ['branch_merge_proposal_id'])
             votes_map = defaultdict(list)
             for vote in votes:
-                votes_map[vote.branch_merge_proposalID].append(vote)
+                votes_map[vote.branch_merge_proposal_id].append(vote)
             for mp in branch_merge_proposals:
                 get_property_cache(mp).votes = votes_map[mp.id]
-            comments = load_related(CodeReviewComment, votes, ['commentID'])
-            load_related(Message, comments, ['messageID'])
-            person_ids.update(vote.reviewerID for vote in votes)
+            comments = load_related(CodeReviewComment, votes, ['comment_id'])
+            load_related(Message, comments, ['message_id'])
+            person_ids.update(vote.reviewer_id for vote in votes)
 
             # we also provide a summary of diffs, so load them
             load_related(LibraryFileAlias, diffs, ['diff_textID'])
@@ -1439,8 +1452,8 @@ class BranchMergeProposalGetter:
             BranchMergeProposal.registrantID == participant.id)
 
         review_select = Select(
-                [CodeReviewVoteReference.branch_merge_proposalID],
-                [CodeReviewVoteReference.reviewerID == participant.id])
+                [CodeReviewVoteReference.branch_merge_proposal_id],
+                [CodeReviewVoteReference.reviewer == participant])
 
         query = Store.of(participant).find(
             BranchMergeProposal,
@@ -1463,13 +1476,13 @@ class BranchMergeProposalGetter:
         # the actual vote for that person.
         tables = [
             CodeReviewVoteReference,
-            Join(Person, CodeReviewVoteReference.reviewerID == Person.id),
+            Join(Person, CodeReviewVoteReference.reviewer == Person.id),
             LeftJoin(
                 CodeReviewComment,
-                CodeReviewVoteReference.commentID == CodeReviewComment.id)]
+                CodeReviewVoteReference.comment == CodeReviewComment.id)]
         results = store.using(*tables).find(
             (CodeReviewVoteReference, Person, CodeReviewComment),
-            CodeReviewVoteReference.branch_merge_proposalID.is_in(ids))
+            CodeReviewVoteReference.branch_merge_proposal_id.is_in(ids))
         for reference, person, comment in results:
             result[reference.branch_merge_proposal].append(reference)
         return result
diff --git a/lib/lp/code/model/codereviewcomment.py b/lib/lp/code/model/codereviewcomment.py
index 47f640c..1029b4e 100644
--- a/lib/lp/code/model/codereviewcomment.py
+++ b/lib/lp/code/model/codereviewcomment.py
@@ -10,9 +10,11 @@ __all__ = [
 
 from textwrap import TextWrapper
 
-from sqlobject import (
-    ForeignKey,
-    StringCol,
+from storm.locals import (
+    Int,
+    Reference,
+    Store,
+    Unicode,
     )
 from zope.interface import implementer
 
@@ -22,8 +24,8 @@ from lp.code.interfaces.codereviewcomment import (
     ICodeReviewComment,
     ICodeReviewCommentDeletion,
     )
-from lp.services.database.enumcol import EnumCol
-from lp.services.database.sqlbase import SQLBase
+from lp.services.database.enumcol import DBEnum
+from lp.services.database.stormbase import StormBase
 from lp.services.mail.signedmessage import signed_message_from_string
 
 
@@ -60,17 +62,27 @@ def quote_text_as_email(text, width=80):
 
 
 @implementer(ICodeReviewComment, ICodeReviewCommentDeletion, IHasBranchTarget)
-class CodeReviewComment(SQLBase):
+class CodeReviewComment(StormBase):
     """A table linking branch merge proposals and messages."""
 
-    _table = 'CodeReviewMessage'
-
-    branch_merge_proposal = ForeignKey(
-        dbName='branch_merge_proposal', foreignKey='BranchMergeProposal',
-        notNull=True)
-    message = ForeignKey(dbName='message', foreignKey='Message', notNull=True)
-    vote = EnumCol(dbName='vote', notNull=False, schema=CodeReviewVote)
-    vote_tag = StringCol(default=None)
+    __storm_table__ = 'CodeReviewMessage'
+
+    id = Int(primary=True)
+    branch_merge_proposal_id = Int(
+        name='branch_merge_proposal', allow_none=False)
+    branch_merge_proposal = Reference(
+        branch_merge_proposal_id, 'BranchMergeProposal.id')
+    message_id = Int(name='message', allow_none=False)
+    message = Reference(message_id, 'Message.id')
+    vote = DBEnum(name='vote', allow_none=True, enum=CodeReviewVote)
+    vote_tag = Unicode(default=None)
+
+    def __init__(self, branch_merge_proposal, message, vote=None,
+                 vote_tag=None):
+        self.branch_merge_proposal = branch_merge_proposal
+        self.message = message
+        self.vote = vote
+        self.vote_tag = vote_tag
 
     @property
     def author(self):
@@ -134,3 +146,7 @@ class CodeReviewComment(SQLBase):
         return (
             self.branch_merge_proposal.userCanSetCommentVisibility(user) or
             (user is not None and user.inTeam(self.author)))
+
+    def destroySelf(self):
+        """Delete this comment."""
+        Store.of(self).remove(self)
diff --git a/lib/lp/code/model/codereviewvote.py b/lib/lp/code/model/codereviewvote.py
index d2e5c53..b695ebe 100644
--- a/lib/lp/code/model/codereviewvote.py
+++ b/lib/lp/code/model/codereviewvote.py
@@ -8,12 +8,15 @@ __all__ = [
     'CodeReviewVoteReference',
     ]
 
-from sqlobject import (
-    ForeignKey,
-    StringCol,
+import pytz
+from storm.locals import (
+    DateTime,
+    Int,
+    Reference,
+    Store,
+    Unicode,
     )
 from zope.interface import implementer
-from zope.schema import Int
 
 from lp.code.errors import (
     ClaimReviewFailed,
@@ -22,27 +25,36 @@ from lp.code.errors import (
     )
 from lp.code.interfaces.codereviewvote import ICodeReviewVoteReference
 from lp.services.database.constants import DEFAULT
-from lp.services.database.datetimecol import UtcDateTimeCol
-from lp.services.database.sqlbase import SQLBase
+from lp.services.database.stormbase import StormBase
 
 
 @implementer(ICodeReviewVoteReference)
-class CodeReviewVoteReference(SQLBase):
+class CodeReviewVoteReference(StormBase):
     """See `ICodeReviewVote`"""
 
-    _table = 'CodeReviewVote'
-    id = Int()
-    branch_merge_proposal = ForeignKey(
-        dbName='branch_merge_proposal', foreignKey='BranchMergeProposal',
-        notNull=True)
-    date_created = UtcDateTimeCol(notNull=True, default=DEFAULT)
-    registrant = ForeignKey(
-        dbName='registrant', foreignKey='Person', notNull=True)
-    reviewer = ForeignKey(
-        dbName='reviewer', foreignKey='Person', notNull=True)
-    review_type = StringCol(default=None)
-    comment = ForeignKey(
-        dbName='vote_message', foreignKey='CodeReviewComment', default=None)
+    __storm_table__ = 'CodeReviewVote'
+
+    id = Int(primary=True)
+    branch_merge_proposal_id = Int(
+        name='branch_merge_proposal', allow_none=False)
+    branch_merge_proposal = Reference(
+        branch_merge_proposal_id, 'BranchMergeProposal.id')
+    date_created = DateTime(tzinfo=pytz.UTC, allow_none=False, default=DEFAULT)
+    registrant_id = Int(name='registrant', allow_none=False)
+    registrant = Reference(registrant_id, 'Person.id')
+    reviewer_id = Int(name='reviewer', allow_none=False)
+    reviewer = Reference(reviewer_id, 'Person.id')
+    review_type = Unicode(default=None)
+    comment_id = Int(name='vote_message', default=None)
+    comment = Reference(comment_id, 'CodeReviewComment.id')
+
+    def __init__(self, branch_merge_proposal, registrant, reviewer,
+                 review_type=None, date_created=DEFAULT):
+        self.branch_merge_proposal = branch_merge_proposal
+        self.registrant = registrant
+        self.reviewer = reviewer
+        self.review_type = review_type
+        self.date_created = date_created
 
     @property
     def is_pending(self):
@@ -96,6 +108,10 @@ class CodeReviewVoteReference(SQLBase):
         self.validateReasignReview(reviewer)
         self.reviewer = reviewer
 
+    def destroySelf(self):
+        """Delete this vote."""
+        Store.of(self).remove(self)
+
     def delete(self):
         """See `ICodeReviewVote`"""
         if not self.is_pending:
diff --git a/lib/lp/code/model/gitcollection.py b/lib/lp/code/model/gitcollection.py
index 4095d5e..6447d0b 100644
--- a/lib/lp/code/model/gitcollection.py
+++ b/lib/lp/code/model/gitcollection.py
@@ -412,10 +412,10 @@ class GenericGitCollection:
         tables = [
             BranchMergeProposal,
             Join(CodeReviewVoteReference,
-                 CodeReviewVoteReference.branch_merge_proposalID == \
+                 CodeReviewVoteReference.branch_merge_proposal ==
                  BranchMergeProposal.id),
             LeftJoin(CodeReviewComment,
-                 CodeReviewVoteReference.commentID == CodeReviewComment.id)]
+                 CodeReviewVoteReference.comment == CodeReviewComment.id)]
 
         expressions = [
             CodeReviewVoteReference.reviewer == reviewer,
diff --git a/lib/lp/code/model/tests/test_branch.py b/lib/lp/code/model/tests/test_branch.py
index 1978e88..e2421ba 100644
--- a/lib/lp/code/model/tests/test_branch.py
+++ b/lib/lp/code/model/tests/test_branch.py
@@ -1566,8 +1566,8 @@ class TestBranchDeletionConsequences(TestCase):
         comment_id = comment.id
         branch = comment.branch_merge_proposal.source_branch
         branch.destroySelf(break_references=True)
-        self.assertRaises(
-            SQLObjectNotFound, CodeReviewComment.get, comment_id)
+        self.assertIsNone(
+            IStore(CodeReviewComment).get(CodeReviewComment, comment_id))
 
     def test_deleteTargetCodeReviewComment(self):
         """Deletion of branches that have CodeReviewComments works."""
@@ -1575,8 +1575,8 @@ class TestBranchDeletionConsequences(TestCase):
         comment_id = comment.id
         branch = comment.branch_merge_proposal.target_branch
         branch.destroySelf(break_references=True)
-        self.assertRaises(
-            SQLObjectNotFound, CodeReviewComment.get, comment_id)
+        self.assertIsNone(
+            IStore(CodeReviewComment).get(CodeReviewComment, comment_id))
 
     def test_branchWithBugRequirements(self):
         """Deletion requirements for a branch with a bug are right."""
diff --git a/lib/lp/code/model/tests/test_gitrepository.py b/lib/lp/code/model/tests/test_gitrepository.py
index a8b9c35..62bf865 100644
--- a/lib/lp/code/model/tests/test_gitrepository.py
+++ b/lib/lp/code/model/tests/test_gitrepository.py
@@ -1086,8 +1086,8 @@ class TestGitRepositoryDeletionConsequences(TestCaseWithFactory):
         comment_id = comment.id
         repository = comment.branch_merge_proposal.source_git_repository
         repository.destroySelf(break_references=True)
-        self.assertRaises(
-            SQLObjectNotFound, CodeReviewComment.get, comment_id)
+        self.assertIsNone(
+            IStore(CodeReviewComment).get(CodeReviewComment, comment_id))
 
     def test_delete_target_CodeReviewComment(self):
         # Deletion of target repositories that have CodeReviewComments works.
@@ -1095,8 +1095,8 @@ class TestGitRepositoryDeletionConsequences(TestCaseWithFactory):
         comment_id = comment.id
         repository = comment.branch_merge_proposal.target_git_repository
         repository.destroySelf(break_references=True)
-        self.assertRaises(
-            SQLObjectNotFound, CodeReviewComment.get, comment_id)
+        self.assertIsNone(
+            IStore(CodeReviewComment).get(CodeReviewComment, comment_id))
 
     def test_sourceBranchWithCodeReviewVoteReference(self):
         # break_references handles CodeReviewVoteReference source repository.
diff --git a/lib/lp/code/stories/webservice/xx-branchmergeproposal.txt b/lib/lp/code/stories/webservice/xx-branchmergeproposal.txt
index 1580ea4..98483a4 100644
--- a/lib/lp/code/stories/webservice/xx-branchmergeproposal.txt
+++ b/lib/lp/code/stories/webservice/xx-branchmergeproposal.txt
@@ -463,7 +463,7 @@ which is the one we want the method to return.
     ...     product=blob, set_state=BranchMergeProposalStatus.NEEDS_REVIEW,
     ...     registrant=branch_owner, source_branch=source_branch)
     >>> proposal.nominateReviewer(target_owner, branch_owner)
-    <CodeReviewVoteReference at ...>
+    <lp.code.model.codereviewvote.CodeReviewVoteReference object at ...>
 
 And then we propose a merge the other way, so that the owner is target,
 but they have not been asked to review, meaning that the method shouldn't
@@ -474,7 +474,7 @@ return this review.
     ...     product=blob, set_state=BranchMergeProposalStatus.NEEDS_REVIEW,
     ...     registrant=target_owner, source_branch=target_branch)
     >>> proposal.nominateReviewer(branch_owner, target_owner)
-    <CodeReviewVoteReference at ...>
+    <lp.code.model.codereviewvote.CodeReviewVoteReference object at ...>
     >>> logout()
 
     >>> proposals = webservice.named_get('/~target', 'getRequestedReviews'
diff --git a/lib/lp/codehosting/puller/tests/test_scheduler.py b/lib/lp/codehosting/puller/tests/test_scheduler.py
index 2b08509..34d53b6 100644
--- a/lib/lp/codehosting/puller/tests/test_scheduler.py
+++ b/lib/lp/codehosting/puller/tests/test_scheduler.py
@@ -553,7 +553,7 @@ class TestPullerMasterIntegration(PullerBranchTestCase):
     """Tests for the puller master that launch sub-processes."""
 
     layer = ZopelessAppServerLayer
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     def setUp(self):
         super(TestPullerMasterIntegration, self).setUp()
diff --git a/lib/lp/registry/model/projectgroup.py b/lib/lp/registry/model/projectgroup.py
index 8a22fa8..bc6c5e5 100644
--- a/lib/lp/registry/model/projectgroup.py
+++ b/lib/lp/registry/model/projectgroup.py
@@ -50,7 +50,11 @@ from lp.blueprints.model.specification import (
     Specification,
     )
 from lp.blueprints.model.specificationsearch import search_specifications
-from lp.blueprints.model.sprint import HasSprintsMixin
+from lp.blueprints.model.sprint import (
+    HasSprintsMixin,
+    Sprint,
+    )
+from lp.blueprints.model.sprintspecification import SprintSpecification
 from lp.bugs.interfaces.bugsummary import IBugSummaryDimension
 from lp.bugs.model.bugtarget import (
     BugTargetBase,
@@ -239,15 +243,14 @@ class ProjectGroup(SQLBase, BugTargetBase, HasSpecificationsMixin,
         """ See `IProjectGroup`."""
         return not self.getBranches().is_empty()
 
-    def _getBaseQueryAndClauseTablesForQueryingSprints(self):
-        query = """
-            Product.project = %s
-            AND Specification.product = Product.id
-            AND Specification.id = SprintSpecification.specification
-            AND SprintSpecification.sprint = Sprint.id
-            AND SprintSpecification.status = %s
-            """ % sqlvalues(self, SprintSpecificationStatus.ACCEPTED)
-        return query, ['Product', 'Specification', 'SprintSpecification']
+    def _getBaseClausesForQueryingSprints(self):
+        return [
+            Product.projectgroup == self,
+            Specification.product == Product.id,
+            Specification.id == SprintSpecification.specification_id,
+            SprintSpecification.sprint == Sprint.id,
+            SprintSpecification.status == SprintSpecificationStatus.ACCEPTED,
+            ]
 
     def specifications(self, user, sort=None, quantity=None, filter=None,
                        series=None, need_people=True, need_branches=True,
diff --git a/lib/lp/services/database/policy.py b/lib/lp/services/database/policy.py
index 066fdb3..691baf4 100644
--- a/lib/lp/services/database/policy.py
+++ b/lib/lp/services/database/policy.py
@@ -358,7 +358,7 @@ class LaunchpadDatabasePolicy(BaseDatabasePolicy):
         slave_store = self.getStore(MAIN_STORE, SLAVE_FLAVOR)
         hot_standby, streaming_lag = slave_store.execute("""
             SELECT
-                current_setting('hot_standby') = 'on',
+                pg_is_in_recovery(),
                 now() - pg_last_xact_replay_timestamp()
             """).get_one()
         if hot_standby and streaming_lag is not None:
diff --git a/lib/lp/services/gpg/handler.py b/lib/lp/services/gpg/handler.py
index b2bcbad..e3eba45 100644
--- a/lib/lp/services/gpg/handler.py
+++ b/lib/lp/services/gpg/handler.py
@@ -489,12 +489,8 @@ class GPGHandler:
             raise GPGKeyExpired(key)
         return key
 
-    def _submitKey(self, content):
-        """Submit an ASCII-armored public key export to the keyserver.
-
-        It issues a POST at /pks/add on the keyserver specified in the
-        configuration.
-        """
+    def submitKey(self, content):
+        """See `IGPGHandler`."""
         keyserver_http_url = '%s:%s' % (
             config.gpghandler.host, config.gpghandler.port)
 
@@ -527,7 +523,7 @@ class GPGHandler:
             return
 
         pub_key = self.retrieveKey(fingerprint)
-        self._submitKey(pub_key.export())
+        self.submitKey(pub_key.export())
 
     def getURLForKeyInServer(self, fingerprint, action='index', public=False):
         """See IGPGHandler"""
diff --git a/lib/lp/services/gpg/interfaces.py b/lib/lp/services/gpg/interfaces.py
index 78b44c8..d6f0f73 100644
--- a/lib/lp/services/gpg/interfaces.py
+++ b/lib/lp/services/gpg/interfaces.py
@@ -357,6 +357,17 @@ class IGPGHandler(Interface):
         :return: a `PymeKey`object containing the key information.
         """
 
+    def submitKey(content):
+        """Submit an ASCII-armored public key export to the keyserver.
+
+        It issues a POST at /pks/add on the keyserver specified in the
+        configuration.
+
+        :param content: The exported public key, as a byte string.
+        :raise GPGUploadFailure: if the keyserver could not be reached.
+        :raise AssertionError: if the POST request failed.
+        """
+
     def uploadPublicKey(fingerprint):
         """Upload the specified public key to a keyserver.
 
@@ -365,8 +376,8 @@ class IGPGHandler(Interface):
 
         :param fingerprint: The key fingerprint, which must be an hexadecimal
             string.
-        :raise GPGUploadFailure: if the keyserver could not be reaches.
-        :raise AssertionError: if the POST request doesn't succeed.
+        :raise GPGUploadFailure: if the keyserver could not be reached.
+        :raise AssertionError: if the POST request failed.
         """
 
     def localKeys(filter=None, secret=False):
diff --git a/lib/lp/services/librarianserver/tests/test_storage_db.py b/lib/lp/services/librarianserver/tests/test_storage_db.py
index 47fe847..b24d87b 100644
--- a/lib/lp/services/librarianserver/tests/test_storage_db.py
+++ b/lib/lp/services/librarianserver/tests/test_storage_db.py
@@ -146,7 +146,7 @@ class LibrarianStorageDBTests(TestCase):
 class LibrarianStorageSwiftTests(TestCase):
 
     layer = LaunchpadZopelessLayer
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     def setUp(self):
         super(LibrarianStorageSwiftTests, self).setUp()
diff --git a/lib/lp/services/mail/helpers.py b/lib/lp/services/mail/helpers.py
index 82640aa..80f68d3 100644
--- a/lib/lp/services/mail/helpers.py
+++ b/lib/lp/services/mail/helpers.py
@@ -35,7 +35,13 @@ class IncomingEmailError(Exception):
 
 
 def get_main_body(signed_msg):
-    """Returns the first text part of the email."""
+    """Returns the first text part of the email.
+
+    This always returns text (or None if the email has no text parts at
+    all).  It decodes using the character set in the text part's
+    Content-Type, or ISO-8859-1 if unspecified (in order to minimise the
+    chances of `UnicodeDecodeError`s).
+    """
     msg = getattr(signed_msg, 'signedMessage', None)
     if msg is None:
         # The email wasn't signed.
@@ -43,9 +49,11 @@ def get_main_body(signed_msg):
     if msg.is_multipart():
         for part in msg.walk():
             if part.get_content_type() == 'text/plain':
-                return part.get_payload(decode=True)
+                charset = part.get_content_charset('ISO-8859-1')
+                return part.get_payload(decode=True).decode(charset)
     else:
-        return msg.get_payload(decode=True)
+        charset = msg.get_content_charset('ISO-8859-1')
+        return msg.get_payload(decode=True).decode(charset)
 
 
 def guess_bugtask(bug, person):
diff --git a/lib/lp/services/signing/tests/helpers.py b/lib/lp/services/signing/tests/helpers.py
index f819745..6831edb 100644
--- a/lib/lp/services/signing/tests/helpers.py
+++ b/lib/lp/services/signing/tests/helpers.py
@@ -49,7 +49,7 @@ class SigningServiceClientFixture(fixtures.Fixture):
                   openpgp_key_algorithm=None, length=None):
         key = bytes(PrivateKey.generate().public_key)
         data = {
-            "fingerprint": self.factory.getUniqueHexString(40),
+            "fingerprint": self.factory.getUniqueHexString(40).upper(),
             "public-key": key,
             }
         self.generate_returns.append((key_type, data))
@@ -69,7 +69,7 @@ class SigningServiceClientFixture(fixtures.Fixture):
 
     def _inject(self, key_type, private_key, public_key, description,
                 created_at):
-        data = {'fingerprint': self.factory.getUniqueHexString(40)}
+        data = {'fingerprint': self.factory.getUniqueHexString(40).upper()}
         self.inject_returns.append(data)
         return data
 
diff --git a/lib/lp/services/worlddata/vocabularies.py b/lib/lp/services/worlddata/vocabularies.py
index 58d2c8e..be963f4 100644
--- a/lib/lp/services/worlddata/vocabularies.py
+++ b/lib/lp/services/worlddata/vocabularies.py
@@ -1,6 +1,8 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 __all__ = [
     'CountryNameVocabulary',
     'LanguageVocabulary',
@@ -10,6 +12,7 @@ __all__ = [
 __metaclass__ = type
 
 import pytz
+import six
 from sqlobject import SQLObjectNotFound
 from zope.interface import alsoProvides
 from zope.schema.vocabulary import (
@@ -24,7 +27,7 @@ from lp.services.worlddata.model.country import Country
 from lp.services.worlddata.model.language import Language
 
 # create a sorted list of the common time zone names, with UTC at the start
-_values = sorted(pytz.common_timezones)
+_values = sorted(six.ensure_text(tz) for tz in pytz.common_timezones)
 _values.remove('UTC')
 _values.insert(0, 'UTC')
 
diff --git a/lib/lp/soyuz/adapters/tests/test_archivedependencies.py b/lib/lp/soyuz/adapters/tests/test_archivedependencies.py
index 7cd3cad..d5a2068 100644
--- a/lib/lp/soyuz/adapters/tests/test_archivedependencies.py
+++ b/lib/lp/soyuz/adapters/tests/test_archivedependencies.py
@@ -128,7 +128,7 @@ class TestSourcesList(TestCaseWithFactory):
     """Test sources.list contents for building, and related mechanisms."""
 
     layer = LaunchpadZopelessLayer
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     ubuntu_components = [
         "main", "restricted", "universe", "multiverse", "partner"]
diff --git a/lib/lp/soyuz/configure.zcml b/lib/lp/soyuz/configure.zcml
index 2e97958..643a85b 100644
--- a/lib/lp/soyuz/configure.zcml
+++ b/lib/lp/soyuz/configure.zcml
@@ -373,7 +373,6 @@
             set_schema="lp.soyuz.interfaces.archive.IArchiveRestricted"/>
         <require
             permission="launchpad.InternalScriptsOnly"
-            attributes="signing_key_owner"
             set_attributes="dirty_suites distribution signing_key_owner
                             signing_key_fingerprint"/>
     </class>
diff --git a/lib/lp/soyuz/interfaces/archive.py b/lib/lp/soyuz/interfaces/archive.py
index 407f953..b6cc663 100644
--- a/lib/lp/soyuz/interfaces/archive.py
+++ b/lib/lp/soyuz/interfaces/archive.py
@@ -461,6 +461,8 @@ class IArchiveSubscriberView(Interface):
             "explicit publish flag and any other constraints."))
     series_with_sources = Attribute(
         "DistroSeries to which this archive has published sources")
+    signing_key_owner = Reference(
+        title=_("Archive signing key owner"), required=False, schema=IPerson)
     signing_key_fingerprint = exported(
         Text(
             title=_("Archive signing key fingerprint"), required=False,
diff --git a/lib/lp/soyuz/model/archive.py b/lib/lp/soyuz/model/archive.py
index a37b737..0d58e56 100644
--- a/lib/lp/soyuz/model/archive.py
+++ b/lib/lp/soyuz/model/archive.py
@@ -466,7 +466,7 @@ class Archive(SQLBase):
         return (
             not config.personalpackagearchive.require_signing_keys or
             not self.is_ppa or
-            self.signing_key is not None)
+            self.signing_key_fingerprint is not None)
 
     @property
     def reference(self):
@@ -2717,10 +2717,12 @@ class ArchiveSet:
                     (owner.name, distribution.name, name))
 
         # Signing-key for the default PPA is reused when it's already present.
-        signing_key = None
+        signing_key_owner = None
+        signing_key_fingerprint = None
         if purpose == ArchivePurpose.PPA:
             if owner.archive is not None:
-                signing_key = owner.archive.signing_key
+                signing_key_owner = owner.archive.signing_key_owner
+                signing_key_fingerprint = owner.archive.signing_key_fingerprint
             else:
                 # owner.archive is a cached property and we've just cached it.
                 del get_property_cache(owner).archive
@@ -2729,9 +2731,8 @@ class ArchiveSet:
             owner=owner, distribution=distribution, name=name,
             displayname=displayname, description=description,
             purpose=purpose, publish=publish,
-            signing_key_owner=signing_key.owner if signing_key else None,
-            signing_key_fingerprint=(
-                signing_key.fingerprint if signing_key else None),
+            signing_key_owner=signing_key_owner,
+            signing_key_fingerprint=signing_key_fingerprint,
             require_virtualized=require_virtualized)
 
         # Upon creation archives are enabled by default.
diff --git a/lib/lp/soyuz/scripts/ppakeygenerator.py b/lib/lp/soyuz/scripts/ppakeygenerator.py
index 190b4a0..88e1d84 100644
--- a/lib/lp/soyuz/scripts/ppakeygenerator.py
+++ b/lib/lp/soyuz/scripts/ppakeygenerator.py
@@ -34,7 +34,7 @@ class PPAKeyGenerator(LaunchpadCronScript):
             (archive.reference, archive.displayname))
         archive_signing_key = IArchiveGPGSigningKey(archive)
         archive_signing_key.generateSigningKey(log=self.logger)
-        self.logger.info("Key %s" % archive.signing_key.fingerprint)
+        self.logger.info("Key %s" % archive.signing_key_fingerprint)
 
     def main(self):
         """Generate signing keys for the selected PPAs."""
@@ -45,11 +45,11 @@ class PPAKeyGenerator(LaunchpadCronScript):
                 raise LaunchpadScriptFailure(
                     "No archive named '%s' could be found."
                     % self.options.archive)
-            if archive.signing_key is not None:
+            if archive.signing_key_fingerprint is not None:
                 raise LaunchpadScriptFailure(
                     "%s (%s) already has a signing_key (%s)"
                     % (archive.reference, archive.displayname,
-                       archive.signing_key.fingerprint))
+                       archive.signing_key_fingerprint))
             archives = [archive]
         else:
             archive_set = getUtility(IArchiveSet)
diff --git a/lib/lp/soyuz/scripts/tests/test_ppakeygenerator.py b/lib/lp/soyuz/scripts/tests/test_ppakeygenerator.py
index 56e8710..a5d3caf 100644
--- a/lib/lp/soyuz/scripts/tests/test_ppakeygenerator.py
+++ b/lib/lp/soyuz/scripts/tests/test_ppakeygenerator.py
@@ -83,7 +83,7 @@ class TestPPAKeyGenerator(TestCase):
             LaunchpadScriptFailure,
             ("~cprov/ubuntu/ppa (PPA for Celso Providelo) already has a "
              "signing_key (%s)" %
-             cprov.archive.signing_key.fingerprint),
+             cprov.archive.signing_key_fingerprint),
             key_generator.main)
 
     def testGenerateKeyForASinglePPA(self):
@@ -95,14 +95,14 @@ class TestPPAKeyGenerator(TestCase):
         cprov = getUtility(IPersonSet).getByName('cprov')
         self._fixArchiveForKeyGeneration(cprov.archive)
 
-        self.assertTrue(cprov.archive.signing_key is None)
+        self.assertIsNone(cprov.archive.signing_key_fingerprint)
 
         txn = FakeTransaction()
         key_generator = self._getKeyGenerator(
             archive_reference='~cprov/ubuntutest/ppa', txn=txn)
         key_generator.main()
 
-        self.assertTrue(cprov.archive.signing_key is not None)
+        self.assertIsNotNone(cprov.archive.signing_key_fingerprint)
         self.assertEqual(txn.commit_count, 1)
 
     def testGenerateKeyForAllPPA(self):
@@ -115,13 +115,13 @@ class TestPPAKeyGenerator(TestCase):
 
         for archive in archives:
             self._fixArchiveForKeyGeneration(archive)
-            self.assertTrue(archive.signing_key is None)
+            self.assertIsNone(archive.signing_key_fingerprint)
 
         txn = FakeTransaction()
         key_generator = self._getKeyGenerator(txn=txn)
         key_generator.main()
 
         for archive in archives:
-            self.assertTrue(archive.signing_key is not None)
+            self.assertIsNotNone(archive.signing_key_fingerprint)
 
         self.assertEqual(txn.commit_count, len(archives))
diff --git a/lib/lp/soyuz/stories/soyuz/xx-person-packages.txt b/lib/lp/soyuz/stories/soyuz/xx-person-packages.txt
index d815121..95ff407 100644
--- a/lib/lp/soyuz/stories/soyuz/xx-person-packages.txt
+++ b/lib/lp/soyuz/stories/soyuz/xx-person-packages.txt
@@ -400,7 +400,7 @@ Then delete the 'source2' package.
     ...         print(extract_text(empty_section))
     >>> print_ppa_packages(admin_browser.contents)
     Source             Published   Status     Series   Section  Build Status
-    source2 - 666...   a moment ago Deleted   ...
+    source2 - 666...               Deleted    ...
     >>> update_cached_records()
 
 Now re-list the PPA's packages, 'source2' was deleted but still
diff --git a/lib/lp/soyuz/tests/test_archive.py b/lib/lp/soyuz/tests/test_archive.py
index 91acf53..5c3f3b6 100644
--- a/lib/lp/soyuz/tests/test_archive.py
+++ b/lib/lp/soyuz/tests/test_archive.py
@@ -4046,7 +4046,7 @@ class TestSigningKeyPropagation(TestCaseWithFactory):
 
     def test_ppa_created_with_no_signing_key(self):
         ppa = self.factory.makeArchive(purpose=ArchivePurpose.PPA)
-        self.assertIsNone(ppa.signing_key)
+        self.assertIsNone(ppa.signing_key_fingerprint)
 
     def test_default_signing_key_propagated_to_new_ppa(self):
         person = self.factory.makePerson()
diff --git a/lib/lp/testing/factory.py b/lib/lp/testing/factory.py
index f5ad237..c109014 100644
--- a/lib/lp/testing/factory.py
+++ b/lib/lp/testing/factory.py
@@ -1121,14 +1121,14 @@ class BareLaunchpadObjectFactory(ObjectFactory):
     def makeSprint(self, title=None, name=None):
         """Make a sprint."""
         if title is None:
-            title = self.getUniqueString('title')
+            title = self.getUniqueUnicode('title')
         owner = self.makePerson()
         if name is None:
-            name = self.getUniqueString('name')
+            name = self.getUniqueUnicode('name')
         time_starts = datetime(2009, 1, 1, tzinfo=pytz.UTC)
         time_ends = datetime(2009, 1, 2, tzinfo=pytz.UTC)
-        time_zone = 'UTC'
-        summary = self.getUniqueString('summary')
+        time_zone = u'UTC'
+        summary = self.getUniqueUnicode('summary')
         return getUtility(ISprintSet).new(
             owner=owner, name=name, title=title, time_zone=time_zone,
             time_starts=time_starts, time_ends=time_ends, summary=summary)
diff --git a/lib/lp/translations/pottery/tests/test_detect_intltool.py b/lib/lp/translations/pottery/tests/test_detect_intltool.py
index cc0d5d7..21dce33 100644
--- a/lib/lp/translations/pottery/tests/test_detect_intltool.py
+++ b/lib/lp/translations/pottery/tests/test_detect_intltool.py
@@ -6,9 +6,11 @@ __metaclass__ = type
 import errno
 import os
 import tarfile
+from textwrap import dedent
 
 from breezy.controldir import ControlDir
 
+from lp.services.scripts.tests import run_script
 from lp.testing import TestCase
 from lp.translations.pottery.detect_intltool import is_intltool_structure
 
@@ -52,6 +54,18 @@ class SetupTestPackageMixin:
             with open(path, 'w') as the_file:
                 the_file.write(content)
 
+    def test_pottery_generate_intltool_script(self):
+        # Let the script run to see it works fine.
+        self.prepare_package("intltool_POTFILES_in_2")
+
+        return_code, stdout, stderr = run_script(
+            'scripts/rosetta/pottery-generate-intltool.py', [])
+
+        self.assertEqual(dedent("""\
+            module1/po/messages.pot
+            po/messages.pot
+            """), stdout)
+
 
 class TestDetectIntltoolInBzrTree(TestCase, SetupTestPackageMixin):
 
diff --git a/scripts/rosetta/pottery-generate-intltool.py b/scripts/rosetta/pottery-generate-intltool.py
new file mode 100755
index 0000000..4557676
--- /dev/null
+++ b/scripts/rosetta/pottery-generate-intltool.py
@@ -0,0 +1,56 @@
+#!/usr/bin/python2 -S
+#
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Print a list of directories that contain a valid intltool structure."""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import _pythonpath
+
+import os.path
+
+from lpbuildd.pottery.intltool import generate_pots
+from lpbuildd.tests.fakeslave import UncontainedBackend as _UncontainedBackend
+
+from lp.services.scripts.base import LaunchpadScript
+
+
+class UncontainedBackend(_UncontainedBackend):
+    """Like UncontainedBackend, except avoid executing "test".
+
+    Otherwise we can end up with confusion between the Unix "test" utility
+    and Launchpad's bin/test.
+    """
+
+    def path_exists(self, path):
+        """See `Backend`."""
+        return os.path.exists(path)
+
+    def isdir(self, path):
+        """See `Backend`."""
+        return os.path.isdir(path)
+
+    def islink(self, path):
+        """See `Backend`."""
+        return os.path.islink(path)
+
+
+class PotteryGenerateIntltool(LaunchpadScript):
+    """Print a list of directories that contain a valid intltool structure."""
+
+    def add_my_options(self):
+        """See `LaunchpadScript`."""
+        self.parser.usage = "%prog [options] [PATH]"
+
+    def main(self):
+        """See `LaunchpadScript`."""
+        path = self.args[0] if self.args else "."
+        backend = UncontainedBackend("dummy")
+        print("\n".join(generate_pots(backend, path)))
+
+
+if __name__ == "__main__":
+    script = PotteryGenerateIntltool(name="pottery-generate-intltool")
+    script.run()
diff --git a/utilities/launchpad-database-setup b/utilities/launchpad-database-setup
index 46a36ce..83b79b4 100755
--- a/utilities/launchpad-database-setup
+++ b/utilities/launchpad-database-setup
@@ -43,13 +43,6 @@ if ! sudo grep -q "port.*5432" /etc/postgresql/$pgversion/main/postgresql.conf; 
   echo "ensure postgres is running on port 5432."
 fi;
 
-if [ -e /etc/init.d/postgresql-$pgversion ]; then
-    sudo /etc/init.d/postgresql-$pgversion stop
-else
-    # This is Maverick.
-    sudo /etc/init.d/postgresql stop $pgversion
-fi
-
 echo Purging postgresql data...
 sudo pg_dropcluster $pgversion main --stop-server
 echo Re-creating postgresql database...
diff --git a/utilities/sourcedeps.cache b/utilities/sourcedeps.cache
index ff07c4c..ca3b453 100644
--- a/utilities/sourcedeps.cache
+++ b/utilities/sourcedeps.cache
@@ -24,8 +24,8 @@
         "[e-mail]-20190614154330-091l9edcnubsjmsx"
     ],
     "loggerhead": [
-        506,
-        "[e-mail]-20200710095850-o3aa6eo5a22jhuun"
+        511,
+        "[e-mail]-20200918084828-dljpy2eewt6umnmd"
     ],
     "pygettextpo": [
         25,
diff --git a/utilities/sourcedeps.conf b/utilities/sourcedeps.conf
index 2377277..2815420 100644
--- a/utilities/sourcedeps.conf
+++ b/utilities/sourcedeps.conf
@@ -13,5 +13,5 @@ bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=280
 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2725
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=433
 difftacular lp:~launchpad/difftacular/trunk;revno=11
-loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=506
+loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=511
 pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=25