Merge lp:~michael.nelson/ubuntu-webcatalog/879268-language-specific-descriptions into lp:ubuntu-webcatalog

[Michael Nelson]

Force lucid to use package translations.

Overview
========

This branch updates the apt-cache that we configure so that it *always* downloads the translations, even when on lucid where it thinks it shouldn't need to (as normally lucid packages file contains descriptions etc.)

Thanks to mvo for the fix.

To test:
 1) setup a dev env on a lucid box,
 2) update the ImportAppInstallTestCase.use_mock_apt_cache class variable to true, and then:
 3) fab test:webcatalog.ImportAppInstallTestCase.test_lang_specific_description_added_to_app

which will fail on r62, but pass for > r62.

[lp:~michael.nelson/ubuntu-webcatalog/879268-language-specific-descriptions]

66. By Michael Nelson on 2012-03-05

DRYd up firefox description.

[Łukasz Czyżykowski (lukasz-czyzykowski)]

review: Approve

=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
--- src/webcatalog/management/commands/import_app_install_data.py	2012-01-06 17:54:47 +0000
+++ src/webcatalog/management/commands/import_app_install_data.py	2012-03-05 10:36:18 +0000
@@ -89,6 +89,11 @@
 
         cache = self.get_apt_cache()
         try:
+            # XXX michaeln bug=879268 Lucid doesnt know about translations.
+            # As long as our server is running on Lucid, we need to ensure
+            # that apt is configured to download package translations,
+            # even though on Lucid they'd normally not be necessary.
+            apt.apt_pkg.config.set("APT::Acquire::Translation", "en")
             cache.update()
         except FetchFailedException:
             # Make sure __exit__ still gets called
 
=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2012-01-06 17:54:47 +0000
+++ src/webcatalog/tests/test_commands.py	2012-03-05 10:36:18 +0000
@@ -64,6 +64,12 @@
 
 class ImportAppInstallTestCase(TestCaseWithFactory):
 
+    FIREFOX_DESCRIPTION = (
+        u'Firefox delivers safe, easy web browsing. A familiar user '
+        u'interface, enhanced security features including protection '
+        u'from online identity theft, and integrated search let you '
+        u'get the most out of the web.')
+
     # If you want to run these tests against the real apt cache (which
     # is slower, but the real deal) you can update the following
     # attribute. Note: 3 tests will fail which make assumptions about
@@ -88,7 +94,7 @@
         """
         mock_cache = MagicMock()
         mock_apt_firefox = self.make_mock_apt_package('firefox',
-            description="Firefox description")
+            description=self.FIREFOX_DESCRIPTION)
         mock_apt_scribus = self.make_mock_apt_package('scribus',
             description="Scribus description")
         mock_other_app = self.make_mock_apt_package('otherapp',
@@ -279,7 +285,7 @@
         self.assertEqual(4, Application.objects.count())
         firefox = Application.objects.get(package_name='firefox')
         scribus = Application.objects.get(package_name='scribus')
-        self.assertEqual("Firefox description", firefox.description)
+        self.assertEqual(self.FIREFOX_DESCRIPTION, firefox.description)
         self.assertEqual("Scribus description", scribus.description)
         # The name and comment come directly from the desktop file when
         # it exists.
@@ -373,6 +379,21 @@
         self.assertEqual('Otherapp the Internet', otherapp.name)
         self.assertEqual('A tagline for Otherapp', otherapp.comment)
 
+    def test_lang_specific_description_added_to_app(self):
+        # Related to bug 879268 - our app server runs on lucid where
+        # python-apt doesn't support language-specific descriptions
+        # which have been used since oneiric.
+        self.assertEqual(0, Application.objects.count())
+
+        call_command(
+            'import_app_install_data', 'precise',
+            local_app_install_deb=self.factory.get_test_path(
+                'app-install-data-test_all.deb'),
+            verbosity=0)
+
+        firefox = Application.objects.get(package_name='firefox')
+        self.assertEqual(self.FIREFOX_DESCRIPTION, firefox.description)
+
 
 class ImportForPurchaseAppsTestCase(TestCaseWithFactory):