Merge lp:~jtv/launchpad/cp-bug-409465 into lp:launchpad

[Jeroen T. Vermeulen]

[Jeroen T. Vermeulen (jtv)]

= Bug 409465 =

This branch is for cherry-picking.

The translation uploads auto-approver was crashing when certain uploads
were waiting to be approved: translation files for disabled templates in
projects (not distributions) where the path for the translation file did
not match any existing POFile's path.

See the bug report for a more detailed analysis. This branch presents a
very minimal fix to prevent regressions, and adds a unit test. The test
establishes that the normal approval case succeeds, and that the problem
case fails as it should (as opposed to breaking completely).

To test:
{{{
./bin/test -vv -t autoapproval
}}}

For Q/A, read error-reports and see that the error does not return. The
test faithfully reproduces the error on an unpatched branch.

I considered updating the existing test cases in the test file I edited
to use TestCaseWithFactory, but... not in a cherrypicking branch!

No lint complaints.

Jeroen

[Данило Шеган (danilo)]

Looks good.

review: Approve

=== modified file 'lib/lp/translations/model/translationimportqueue.py'
--- lib/lp/translations/model/translationimportqueue.py	2009-07-24 12:40:30 +0000
+++ lib/lp/translations/model/translationimportqueue.py	2009-08-06 04:29:04 +0000
@@ -345,8 +345,13 @@
         potemplate = potemplate_subset.getPOTemplateByTranslationDomain(
             translation_domain)
 
-        if (potemplate is None and (sourcepackagename is None or
-            self.sourcepackagename.name != sourcepackagename.name)):
+        is_for_distro = self.distroseries is not None
+        know_package = (
+            sourcepackagename is not None and
+            self.sourcepackagename is not None and
+            self.sourcepackagename.name == sourcepackagename.name)
+
+        if potemplate is None and is_for_distro and not know_package:
             # The source package from where this translation doesn't have the
             # template that this translation needs it, and thus, we look for
             # it in a different source package as a second try. To do it, we

=== modified file 'lib/lp/translations/tests/test_autoapproval.py'
--- lib/lp/translations/tests/test_autoapproval.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/tests/test_autoapproval.py	2009-08-06 13:56:17 +0000
@@ -24,6 +24,7 @@
 from lp.translations.interfaces.customlanguagecode import ICustomLanguageCode
 from lp.translations.interfaces.translationimportqueue import (
     RosettaImportStatus)
+from lp.testing import TestCaseWithFactory
 from lp.testing.factory import LaunchpadObjectFactory
 from canonical.launchpad.webapp.testing import verifyObject
 from canonical.testing import LaunchpadZopelessLayer
@@ -470,6 +471,50 @@
         pofile = entry.getGuessedPOFile()
         self.assertEqual(pofile, self.pofile_nl)
 
+
+class TestGetPOFileFromLanguage(TestCaseWithFactory):
+    """Test `TranslationImportQueueEntry._get_pofile_from_language`."""
+
+    layer = LaunchpadZopelessLayer
+
+    def setUp(self):
+        super(TestGetPOFileFromLanguage, self).setUp()
+        self.queue = TranslationImportQueue()
+
+    def test_get_pofile_from_language_feeds_enabled_template(self):
+        # _get_pofile_from_language will find an enabled template, and
+        # return either an existing POFile for the given language, or a
+        # newly created one.
+        product = self.factory.makeProduct()
+        product.official_rosetta = True
+        trunk = product.getSeries('trunk')
+        template = self.factory.makePOTemplate(
+            productseries=trunk, translation_domain='domain')
+        template.iscurrent = True
+        
+        entry = self.queue.addOrUpdateEntry(
+            'nl.po', '# ...', False, template.owner, productseries=trunk)
+
+        pofile = entry._get_pofile_from_language('nl', 'domain')
+        self.assertNotEqual(None, pofile)
+
+    def test_get_pofile_from_language_starves_disabled_template(self):
+        # _get_pofile_from_language will not consider a disabled
+        # template as an auto-approval target, and so will not return a
+        # POFile for it.
+        product = self.factory.makeProduct()
+        product.official_rosetta = True
+        trunk = product.getSeries('trunk')
+        template = self.factory.makePOTemplate(
+            productseries=trunk, translation_domain='domain')
+        template.iscurrent = False
+        
+        entry = self.queue.addOrUpdateEntry(
+            'nl.po', '# ...', False, template.owner, productseries=trunk)
+
+        pofile = entry._get_pofile_from_language('nl', 'domain')
+        self.assertEqual(None, pofile)
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
-