Merge lp:~henninge/launchpad/bug-523810-needs-information-age into lp:launchpad

[Henning Eggers]

Added a maximum age for translation import queue entries in the new 'Needs Information' state.

[Henning Eggers (henninge)]

= Bug 523810 =

The import queue gardener removes entries from the import queue that have reached a certain age in certain states. The age is configurable through a look-up table and the new "Needs Information" status needs an entry in that table. The maximum age should be identical to "Needs Review" for starters.

== Implementation details ==

Driven by the want to extend test coverage to all entry states that are being cleaned out I moved the look-up table to the interface module where it can be reached from the test.

I also found a nice little use of the with statement again. ;-)

== Tests ==

Run all autoapproval test to verify that the introduction of the GardenerDbUserMixin did not mess up existing tests.

bin/test -vvt autoapproval

== Demo/QA ==

In order to not have to wait half a year for an entry to expire on staging, some SQL magic will be needed to make an entry in the "Needs Information" stage that old. Then wait for a day or so to see it disappear. Staging updates might be a nuissance here.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/translations/interfaces/translationimportqueue.py
  lib/lp/translations/model/translationimportqueue.py
  lib/lp/translations/tests/test_autoapproval.py

== Pylint notices ==

lib/lp/translations/interfaces/translationimportqueue.py
    12: [F0401] Unable to import 'lazr.enum' (No module named enum)
    22: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)
    23: [F0401] Unable to import 'lazr.restful.fields' (No module named restful)
    24: [F0401] Unable to import 'lazr.restful.declarations' (No module named restful)

[Abel Deuring (adeuring)]

Hi Henning,

overall a nice branc, but I have a couple of questions, see
below.

Abel

> = Bug 523810 =
>
> The import queue gardener removes entries from the import
> queue that have reached a certain age in certain states.
> The age is configurable through a look-up table and the new
> "Needs Information" status needs an entry in that table.
> The maximum age should be identical to "Needs Review" for
> starters.
>
> == Implementation details ==
>
> Driven by the want to extend test coverage to all entry
> states that are being cleaned out I moved the look-up
> table to the interface module where it can be reached
> from the test.
>
> I also found a nice little use of the with statement again. ;-)
>
> == Tests ==
>
> Run all autoapproval test to verify that the introduction of
> the GardenerDbUserMixin did not mess up existing tests.
>
> bin/test -vvt autoapproval
>
> == Demo/QA ==
>
> In order to not have to wait half a year for an entry to
> expire on staging, some SQL magic will be needed to make an
> entry in the "Needs Information" stage that old. Then wait
> for a day or so to see it disappear. Staging updates might
> be a nuissance here.
>
> = Launchpad lint =
>
> Checking for conflicts. and issues in doctests and templates.
> Running jslint, xmllint, pyflakes, and pylint.
> Using normal rules.
>
> Linting changed files:
> lib/lp/translations/interfaces/translationimportqueue.py
> lib/lp/translations/model/translationimportqueue.py
> lib/lp/translations/tests/test_autoapproval.py
>
>
> == Pylint notices ==
>
> lib/lp/translations/interfaces/translationimportqueue.py
> 12: [F0401] Unable to import 'lazr.enum' (No module named enum)
> 22: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)
> 23: [F0401] Unable to import 'lazr.restful.fields' (No module named restful)
> 24: [F0401] Unable to import 'lazr.restful.declarations' (No module named restful)
>
>
> === modified file 'lib/lp/translations/interfaces/translationimportqueue.py'
> --- lib/lp/translations/interfaces/translationimportqueue.py 2010-02-05 10:39:45 +0000
> +++ lib/lp/translations/interfaces/translationimportqueue.py 2010-02-19 09:03:16 +0000
> @@ -3,6 +3,8 @@
>
> # pylint: disable-msg=E0211,E0213
>
> +from datetime import timedelta
> +
> from zope.interface import Interface, Attribute
> from zope.schema import (
> Bool, Choice, Datetime, Field, Int, Object, Text, TextLine)
> @@ -39,6 +41,7 @@
> 'RosettaImportStatus',
> 'SpecialTranslationImportTargetFilter',
> 'TranslationFileType',
> + 'TranslationImportQueueEntryAge',
> 'UserCannotSetTranslationImportStatus',
> ]
>
> @@ -111,6 +114,22 @@
> """)
>
>
> +# Some time spans in days.
> +_month = 30
> +_half_year = 366 / 2

This being constants, they should be defined as MONTH and HALF_YEAR,
I think, but...

> +
> +
> +# Period after which entries with certain statuses are culled from the
> +# queue.
> +TranslationImportQueueEntryAge = {
> + RosettaImportStatus.DELETED: timedelta(days=3),
> + RosettaImportStatus.FAILED: timedelta(days=_month),

...seeing this, I think the constants are probably better called
DAYS_OF_MONTH/DAYS_OF_H...

review: Needs Information (code)

[Henning Eggers (henninge)]

> Hi Henning,

Hallo Abel!

> overall a nice branc, but I have a couple of questions, see
> below.

Thanks for the review, though. ;)

> > === modified file
'lib/lp/translations/interfaces/translationimportqueue.py'
> > --- lib/lp/translations/interfaces/translationimportqueue.py 2010-02-05
> 10:39:45 +0000
> > +++ lib/lp/translations/interfaces/translationimportqueue.py 2010-02-19
> 09:03:16 +0000
> > @@ -3,6 +3,8 @@
> >
> > # pylint: disable-msg=E0211,E0213
> >
> > +from datetime import timedelta
> > +
> > from zope.interface import Interface, Attribute
> > from zope.schema import (
> > Bool, Choice, Datetime, Field, Int, Object, Text, TextLine)
> > @@ -39,6 +41,7 @@
> > 'RosettaImportStatus',
> > 'SpecialTranslationImportTargetFilter',
> > 'TranslationFileType',
> > + 'TranslationImportQueueEntryAge',
> > 'UserCannotSetTranslationImportStatus',
> > ]
> >
> > @@ -111,6 +114,22 @@
> > """)
> >
> >
> > +# Some time spans in days.
> > +_month = 30
> > +_half_year = 366 / 2
>
> This being constants, they should be defined as MONTH and HALF_YEAR,
> I think, but...
>
> > +
> > +
> > +# Period after which entries with certain statuses are culled from the
> > +# queue.
> > +TranslationImportQueueEntryAge = {
> > + RosettaImportStatus.DELETED: timedelta(days=3),
> > + RosettaImportStatus.FAILED: timedelta(days=_month),
>
> ...seeing this, I think the constants are probably better called
> DAYS_OF_MONTH/DAYS_OF_HALF_YEAR or DAYS_IN_MONTH/DAYS_IN_HALF_YEAR.

Yes, you are right about the capitalization. And the names are good
suggestions, too. Fixed that.

>
> > + RosettaImportStatus.IMPORTED: timedelta(days=3),
> > + RosettaImportStatus.NEEDS_INFORMATION: timedelta(days=_half_year),
> > + RosettaImportStatus.NEEDS_REVIEW: timedelta(days=_half_year),
> > +}
>
> Our coding style convetions say that this should called
> translation_import_queue_entry_age. Also, I don't think that you
> need to define it in the interfaces module, you could also
> add it to the __all__ list of the model module.

I renamed it but left it in place here, as per our discussion on IRC. We
agreed that the general rule is that tests should not import from model
code. I also noted that I consider these expiration times as
implementation-independent and I don't see a pressing reason *not* to
have this here in the interface module. You agreed to the latter.

>
> > +
> > +
> > class SpecialTranslationImportTargetFilter(DBEnumeratedType):
> > """Special "meta-targets" to filter the queue view by."""
> >
> >
> > === modified file 'lib/lp/translations/model/translationimportqueue.py'
[...]
> > === modified file 'lib/lp/translations/tests/test_autoapproval.py'
> > --- lib/lp/translations/tests/test_autoapproval.py 2010-01-26
15:25:53
> +0000
> > +++ lib/lp/translations/tests/test_autoapproval.py 2010-02-19
09:03:16
> +0000
> > @@ -8,6 +8,9 @@
> > through the possibilities should go here.
> > """
> >
> > +from __future__ import with_statement
> > +
> > +from contextlib import contextmanager
> > from datetime import datetime, timedelta
> > from pytz import UTC
> > import transaction
> > @@ -31,17 +34,28 @@
>...

[Abel Deuring (adeuring)]

Thanks for your changes!

review: Approve (code)

=== modified file 'lib/lp/translations/interfaces/translationimportqueue.py'
--- lib/lp/translations/interfaces/translationimportqueue.py	2010-02-05 10:39:45 +0000
+++ lib/lp/translations/interfaces/translationimportqueue.py	2010-02-19 11:18:22 +0000
@@ -3,6 +3,8 @@
 
 # pylint: disable-msg=E0211,E0213
 
+from datetime import timedelta
+
 from zope.interface import Interface, Attribute
 from zope.schema import (
     Bool, Choice, Datetime, Field, Int, Object, Text, TextLine)
@@ -39,6 +41,7 @@
     'RosettaImportStatus',
     'SpecialTranslationImportTargetFilter',
     'TranslationFileType',
+    'translation_import_queue_entry_age',
     'UserCannotSetTranslationImportStatus',
     ]
 
@@ -111,6 +114,22 @@
         """)
 
 
+# Some time spans in days.
+DAYS_IN_MONTH = 30
+DAYS_IN_HALF_YEAR = 366 / 2
+
+
+# Period after which entries with certain statuses are culled from the
+# queue.
+translation_import_queue_entry_age = {
+    RosettaImportStatus.DELETED: timedelta(days=3),
+    RosettaImportStatus.FAILED: timedelta(days=DAYS_IN_MONTH),
+    RosettaImportStatus.IMPORTED: timedelta(days=3),
+    RosettaImportStatus.NEEDS_INFORMATION: timedelta(days=DAYS_IN_HALF_YEAR),
+    RosettaImportStatus.NEEDS_REVIEW: timedelta(days=DAYS_IN_HALF_YEAR),
+}
+
+
 class SpecialTranslationImportTargetFilter(DBEnumeratedType):
     """Special "meta-targets" to filter the queue view by."""
 

=== modified file 'lib/lp/translations/model/translationimportqueue.py'
--- lib/lp/translations/model/translationimportqueue.py	2010-02-05 09:23:07 +0000
+++ lib/lp/translations/model/translationimportqueue.py	2010-02-19 11:18:22 +0000
@@ -58,6 +58,7 @@
     RosettaImportStatus,
     SpecialTranslationImportTargetFilter,
     TranslationImportQueueConflictError,
+    translation_import_queue_entry_age,
     UserCannotSetTranslationImportStatus)
 from lp.translations.interfaces.potemplate import IPOTemplate
 from lp.translations.interfaces.translations import TranslationConstants
@@ -66,19 +67,6 @@
 from canonical.librarian.interfaces import ILibrarianClient
 
 
-# Approximate number of days in a 6-month period.
-half_year = 366 / 2
-
-# Period after which entries with certain statuses are culled from the
-# queue.
-entry_gc_age = {
-    RosettaImportStatus.DELETED: datetime.timedelta(days=3),
-    RosettaImportStatus.IMPORTED: datetime.timedelta(days=3),
-    RosettaImportStatus.FAILED: datetime.timedelta(days=30),
-    RosettaImportStatus.NEEDS_REVIEW: datetime.timedelta(days=half_year),
-}
-
-
 def is_gettext_name(path):
     """Does given file name indicate it's in gettext (PO or POT) format?"""
     base_name, extension = os.path.splitext(path)
@@ -1256,8 +1244,8 @@
         """
         now = datetime.datetime.now(pytz.UTC)
         deletion_clauses = []
-        for status, gc_age in entry_gc_age.iteritems():
-            cutoff = now - gc_age
+        for status, max_age in translation_import_queue_entry_age.iteritems():
+            cutoff = now - max_age
             deletion_clauses.append(And(
                 TranslationImportQueueEntry.status == status,
                 TranslationImportQueueEntry.date_status_changed < cutoff))

=== modified file 'lib/lp/translations/tests/test_autoapproval.py'
--- lib/lp/translations/tests/test_autoapproval.py	2010-01-26 15:25:53 +0000
+++ lib/lp/translations/tests/test_autoapproval.py	2010-02-19 11:18:22 +0000
@@ -8,6 +8,9 @@
 through the possibilities should go here.
 """
 
+from __future__ import with_statement
+
+from contextlib import contextmanager
 from datetime import datetime, timedelta
 from pytz import UTC
 import transaction
@@ -31,17 +34,34 @@
     TranslationImportQueue, TranslationImportQueueEntry)
 from lp.translations.interfaces.customlanguagecode import ICustomLanguageCode
 from lp.translations.interfaces.translationimportqueue import (
-    RosettaImportStatus)
+    RosettaImportStatus, translation_import_queue_entry_age)
 from lp.testing import TestCaseWithFactory
 from lp.testing.factory import LaunchpadObjectFactory
 from canonical.launchpad.webapp.testing import verifyObject
 from canonical.testing import LaunchpadZopelessLayer
 
 
-def become_the_gardener(layer):
-    """Switch to the translations import queue gardener database role."""
-    transaction.commit()
-    layer.switchDbUser('translations_import_queue_gardener')
+class GardenerDbUserMixin(object):
+    """Switch to the translations import queue gardener database role.
+
+    Admittedly, this might be a little over-engineered but it looks good. ;)
+    """
+
+    def _become(self, dbuser):
+        """Switch to a different db user."""
+        transaction.commit()
+        self.layer.switchDbUser(dbuser)
+
+    def becomeTheGardener(self):
+        """One-way method to avoid unnecessary switch back."""
+        self._become('translations_import_queue_gardener')
+
+    @contextmanager
+    def beingTheGardener(self):
+        """Context manager to restore the launchpad user."""
+        self._become('translations_import_queue_gardener')
+        yield
+        self._become('launchpad')
 
 
 class TestCustomLanguageCode(unittest.TestCase):
@@ -129,7 +149,8 @@
         self.assertEqual(Brazilian_code.language, Language.byCode('pt_BR'))
 
 
-class TestGuessPOFileCustomLanguageCode(unittest.TestCase):
+class TestGuessPOFileCustomLanguageCode(
+    unittest.TestCase, GardenerDbUserMixin):
     """Test interaction with `TranslationImportQueueEntry.getGuessedPOFile`.
 
     Auto-approval of translation files, i.e. figuring out which existing
@@ -176,7 +197,7 @@
         # Of course matching will work without custom language codes.
         tr_file = self._makePOFile('tr')
         entry = self._makeQueueEntry('tr')
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         self.assertEqual(entry.getGuessedPOFile(), tr_file)
 
     def test_CustomLanguageCodeEnablesMatch(self):
@@ -188,7 +209,7 @@
 
         self._setCustomLanguageCode('fy_NL', 'fy')
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         self.assertEqual(entry.getGuessedPOFile(), fy_file)
 
     def test_CustomLanguageCodeParsesBogusLanguage(self):
@@ -199,7 +220,7 @@
 
         self._setCustomLanguageCode('flemish', 'nl')
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         nl_file = entry.getGuessedPOFile()
         self.assertEqual(nl_file.language.code, 'nl')
 
@@ -212,7 +233,7 @@
 
         self._setCustomLanguageCode('sv', None)
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         self.assertEqual(entry.getGuessedPOFile(), None)
         self.assertEqual(entry.status, RosettaImportStatus.DELETED)
 
@@ -225,7 +246,7 @@
 
         self._setCustomLanguageCode('elx', 'el')
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         el_file = entry.getGuessedPOFile()
         self.failIfEqual(el_file, elx_file)
         self.assertEqual(el_file.language.code, 'el')
@@ -240,7 +261,7 @@
 
         self._setCustomLanguageCode('nb', 'nn')
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         self.assertEqual(entry.getGuessedPOFile(), nn_file)
 
     def test_CustomLanguageCodeReplacesMatch(self):
@@ -253,7 +274,7 @@
         self._setCustomLanguageCode('pt', None)
         self._setCustomLanguageCode('pt_PT', 'pt')
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         self.assertEqual(pt_entry.getGuessedPOFile(), None)
         self.assertEqual(pt_PT_entry.getGuessedPOFile(), pt_file)
 
@@ -267,12 +288,12 @@
         self._setCustomLanguageCode('zh_CN', 'zh_TW')
         self._setCustomLanguageCode('zh_TW', 'zh_CN')
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         self.assertEqual(zh_CN_entry.getGuessedPOFile(), zh_TW_file)
         self.assertEqual(zh_TW_entry.getGuessedPOFile(), zh_CN_file)
 
 
-class TestTemplateGuess(unittest.TestCase):
+class TestTemplateGuess(unittest.TestCase, GardenerDbUserMixin):
     """Test auto-approval's attempts to find the right template."""
     layer = LaunchpadZopelessLayer
 
@@ -312,7 +333,7 @@
         # When multiple templates match for a product series,
         # getPOTemplateByPathAndOrigin returns none.
         self._setUpProduct()
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         guessed_template = self.templateset.getPOTemplateByPathAndOrigin(
             'test.pot', productseries=self.productseries)
         self.assertEqual(None, guessed_template)
@@ -321,7 +342,7 @@
         # When multiple templates match on sourcepackagename,
         # getPOTemplateByPathAndOrigin returns none.
         self._setUpDistro()
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         guessed_template = self.templateset.getPOTemplateByPathAndOrigin(
             'test.pot', sourcepackagename=self.packagename)
         self.assertEqual(None, guessed_template)
@@ -330,7 +351,7 @@
         # When multiple templates match on from_sourcepackagename,
         # getPOTemplateByPathAndOrigin returns none.
         self._setUpDistro()
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         guessed_template = self.templateset.getPOTemplateByPathAndOrigin(
             'test.pot', sourcepackagename=self.from_packagename)
         self.assertEqual(None, guessed_template)
@@ -364,7 +385,7 @@
         self.distrotemplate1.sourcepackagename = match_package
         self.distrotemplate2.from_sourcepackagename = match_package
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         guessed_template = self.templateset.getPOTemplateByPathAndOrigin(
             'test.pot', sourcepackagename=match_package)
         self.assertEqual(self.distrotemplate2, guessed_template)
@@ -375,7 +396,7 @@
         self._setUpProduct()
         self.producttemplate1.iscurrent = False
         self.producttemplate2.iscurrent = True
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         guessed_template = self.templateset.getPOTemplateByPathAndOrigin(
             'test.pot', productseries=self.productseries)
         self.assertEqual(guessed_template, self.producttemplate2)
@@ -385,7 +406,7 @@
         self._setUpProduct()
         self.producttemplate1.iscurrent = False
         self.producttemplate2.iscurrent = False
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         guessed_template = self.templateset.getPOTemplateByPathAndOrigin(
             'test.pot', productseries=self.productseries)
         self.assertEqual(guessed_template, None)
@@ -399,7 +420,7 @@
         self.distrotemplate2.iscurrent = True
         self.distrotemplate1.from_sourcepackagename = None
         self.distrotemplate2.from_sourcepackagename = None
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         guessed_template = self.templateset.getPOTemplateByPathAndOrigin(
             'test.pot', distroseries=self.distroseries,
             sourcepackagename=self.packagename)
@@ -412,7 +433,7 @@
         self.distrotemplate2.iscurrent = False
         self.distrotemplate1.from_sourcepackagename = None
         self.distrotemplate2.from_sourcepackagename = None
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         guessed_template = self.templateset.getPOTemplateByPathAndOrigin(
             'test.pot', distroseries=self.distroseries,
             sourcepackagename=self.packagename)
@@ -427,7 +448,7 @@
         self.distrotemplate2.iscurrent = True
         self.distrotemplate1.from_sourcepackagename = self.from_packagename
         self.distrotemplate2.from_sourcepackagename = self.from_packagename
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         guessed_template = self.templateset.getPOTemplateByPathAndOrigin(
             'test.pot', distroseries=self.distroseries,
             sourcepackagename=self.from_packagename)
@@ -441,7 +462,7 @@
         self.distrotemplate2.iscurrent = False
         self.distrotemplate1.from_sourcepackagename = self.from_packagename
         self.distrotemplate2.from_sourcepackagename = self.from_packagename
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         guessed_template = self.templateset.getPOTemplateByPathAndOrigin(
             'test.pot', distroseries=self.distroseries,
             sourcepackagename=self.from_packagename)
@@ -452,7 +473,7 @@
         # translation domain.
         self._setUpDistro()
         subset = POTemplateSubset(distroseries=self.distroseries)
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         potemplate = subset.getPOTemplateByTranslationDomain('test1')
         self.assertEqual(potemplate, self.distrotemplate1)
 
@@ -460,7 +481,7 @@
         # Test getPOTemplateByTranslationDomain for the zero-match case.
         self._setUpDistro()
         subset = POTemplateSubset(distroseries=self.distroseries)
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         potemplate = subset.getPOTemplateByTranslationDomain('notesthere')
         self.assertEqual(potemplate, None)
 
@@ -475,7 +496,7 @@
         clashing_template = other_subset.new(
             'test3', 'test1', 'test3.pot', self.distro.owner)
         distro_subset = POTemplateSubset(distroseries=self.distroseries)
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         potemplate = distro_subset.getPOTemplateByTranslationDomain('test1')
         self.assertEqual(potemplate, None)
 
@@ -505,7 +526,7 @@
             'program/nl.po', 'other contents', False, template.owner,
             productseries=template.productseries, potemplate=template)
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         entry1.getGuessedPOFile()
 
         self.assertEqual(entry1.potemplate, None)
@@ -575,7 +596,7 @@
         self.assertEqual(template, entry.guessed_potemplate)
 
 
-class TestKdePOFileGuess(unittest.TestCase):
+class TestKdePOFileGuess(unittest.TestCase, GardenerDbUserMixin):
     """Test auto-approval's `POFile` guessing for KDE uploads.
 
     KDE has an unusual setup that the approver recognizes as a special
@@ -627,7 +648,7 @@
             poname, self.pocontents, False, self.distroseries.owner,
             sourcepackagename=self.kde_i18n_ca,
             distroseries=self.distroseries)
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         pofile = entry.getGuessedPOFile()
         self.assertEqual(pofile, self.pofile_ca)
 
@@ -639,12 +660,12 @@
             poname, self.pocontents, False, self.distroseries.owner,
             sourcepackagename=self.kde_l10n_nl,
             distroseries=self.distroseries)
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         pofile = entry.getGuessedPOFile()
         self.assertEqual(pofile, self.pofile_nl)
 
 
-class TestGetPOFileFromLanguage(TestCaseWithFactory):
+class TestGetPOFileFromLanguage(TestCaseWithFactory, GardenerDbUserMixin):
     """Test `TranslationImportQueueEntry._get_pofile_from_language`."""
 
     layer = LaunchpadZopelessLayer
@@ -667,7 +688,7 @@
         entry = self.queue.addOrUpdateEntry(
             'nl.po', '# ...', False, template.owner, productseries=trunk)
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         pofile = entry._get_pofile_from_language('nl', 'domain')
         self.assertNotEqual(None, pofile)
 
@@ -685,7 +706,7 @@
         entry = self.queue.addOrUpdateEntry(
             'nl.po', '# ...', False, template.owner, productseries=trunk)
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         pofile = entry._get_pofile_from_language('nl', 'domain')
         self.assertEqual(None, pofile)
 
@@ -705,12 +726,12 @@
         entry = self.queue.addOrUpdateEntry(
             'nl.po', '# ...', False, template.owner, productseries=trunk)
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         pofile = entry._get_pofile_from_language('nl', 'domain')
         self.assertNotEqual(None, pofile)
 
 
-class TestCleanup(TestCaseWithFactory):
+class TestCleanup(TestCaseWithFactory, GardenerDbUserMixin):
     """Test `TranslationImportQueueEntry` garbage collection."""
 
     layer = LaunchpadZopelessLayer
@@ -763,10 +784,14 @@
         entry_id = entry.id
 
         self._setStatus(entry, RosettaImportStatus.APPROVED, one_year_ago)
+        # No write or delete action expected, so no reason to switch the
+        # database user. If it writes or deletes, the test has failed anyway.
         self.queue._cleanUpObsoleteEntries(self.store)
         self.assertTrue(self._exists(entry_id))
 
         self._setStatus(entry, RosettaImportStatus.BLOCKED, one_year_ago)
+        # No write or delete action expected, so no reason to switch the
+        # database user. If it writes or deletes, the test has failed anyway.
         self.queue._cleanUpObsoleteEntries(self.store)
         self.assertTrue(self._exists(entry_id))
 
@@ -774,38 +799,39 @@
         # _cleanUpObsoleteEntries deletes entries in terminal states
         # (Imported, Failed, Deleted) after a few days.  The exact
         # period depends on the state.
-        entry = self._makeProductEntry()
-        entry.potemplate = self.factory.makePOTemplate()
-        self._setStatus(entry, RosettaImportStatus.IMPORTED, None)
-        entry_id = entry.id
-
-        self.queue._cleanUpObsoleteEntries(self.store)
-        self.assertTrue(self._exists(entry_id))
-
-        entry.date_status_changed -= timedelta(days=7)
-        entry.syncUpdate()
-
-        become_the_gardener(self.layer)
-        self.queue._cleanUpObsoleteEntries(self.store)
-        self.assertFalse(self._exists(entry_id))
-
-    def test_cleanUpObsoleteEntries_needs_review(self):
-        # _cleanUpObsoleteEntries cleans up entries in Needs Review
-        # state after a very long wait.
-        entry = self._makeProductEntry()
-        entry.potemplate = self.factory.makePOTemplate()
-        self._setStatus(entry, RosettaImportStatus.NEEDS_REVIEW, None)
-        entry_id = entry.id
-
-        self.queue._cleanUpObsoleteEntries(self.store)
-        self.assertTrue(self._exists(entry_id))
-
-        entry.date_status_changed -= timedelta(days=200)
-        entry.syncUpdate()
-
-        become_the_gardener(self.layer)
-        self.queue._cleanUpObsoleteEntries(self.store)
-        self.assertFalse(self._exists(entry_id))
+        affected_statuses = [
+            RosettaImportStatus.DELETED,
+            RosettaImportStatus.FAILED,
+            RosettaImportStatus.IMPORTED,
+            RosettaImportStatus.NEEDS_INFORMATION,
+            RosettaImportStatus.NEEDS_REVIEW,
+            ]
+        for status in affected_statuses:
+            entry = self._makeProductEntry()
+            entry.potemplate = self.factory.makePOTemplate()
+            maximum_age = translation_import_queue_entry_age[status]
+            # Avoid the exact date here by a day because that could introduce
+            # spurious test failures.
+            almost_oldest_possible_date = (
+                datetime.now(UTC) - maximum_age + timedelta(days=1))
+            self._setStatus(entry, status, almost_oldest_possible_date)
+            entry_id = entry.id
+
+            # No write or delete action expected, so no reason to switch the
+            # database user. If it writes or deletes, the test has failed
+            # anyway.
+            self.queue._cleanUpObsoleteEntries(self.store)
+            self.assertTrue(self._exists(entry_id))
+
+            # Now cross the border, again cushioning it by a day.
+            entry.date_status_changed -= timedelta(days=2)
+            entry.syncUpdate()
+
+            with self.beingTheGardener():
+                self.queue._cleanUpObsoleteEntries(self.store)
+                self.assertFalse(
+                    self._exists(entry_id),
+                    "Queue entry in state '%s' was not removed." % status)
 
 
     def test_cleanUpInactiveProductEntries(self):
@@ -820,7 +846,7 @@
         entry.productseries.product.active = False
         entry.productseries.product.syncUpdate()
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         self.queue._cleanUpInactiveProductEntries(self.store)
         self.assertFalse(self._exists(entry_id))
 
@@ -836,12 +862,12 @@
         entry.distroseries.status = SeriesStatus.OBSOLETE
         entry.distroseries.syncUpdate()
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
         self.queue._cleanUpObsoleteDistroEntries(self.store)
         self.assertFalse(self._exists(entry_id))
 
 
-class TestAutoApprovalNewPOFile(TestCaseWithFactory):
+class TestAutoApprovalNewPOFile(TestCaseWithFactory, GardenerDbUserMixin):
     """Test creation of new `POFile`s in approval."""
 
     layer = LaunchpadZopelessLayer
@@ -872,7 +898,7 @@
         entry = self._makeQueueEntry(trunk)
         rosetta_experts = getUtility(ILaunchpadCelebrities).rosetta_experts
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
 
         pofile = entry.getGuessedPOFile()
 
@@ -890,7 +916,7 @@
 
         entry = self._makeQueueEntry(trunk)
 
-        become_the_gardener(self.layer)
+        self.becomeTheGardener()
 
         pofile = entry.getGuessedPOFile()