Merge lp:~nataliabidart/ubuntu-webcatalog/fix-constraints into lp:ubuntu-webcatalog

[Natalia Bidart]

- While running import_app_install_data, commit the saving of an
  ApplicationForm to avoid IntegrityError (LP: #985901).

[Anthony Lenton (elachuni)]

Looks good.

review: Approve

=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
--- src/webcatalog/management/commands/import_app_install_data.py	2012-04-18 21:27:46 +0000
+++ src/webcatalog/management/commands/import_app_install_data.py	2012-04-19 21:37:20 +0000
@@ -189,7 +189,7 @@
         form = ApplicationForm.get_form_from_desktop_data(data, distroseries)
 
         if form.is_valid():
-            app = form.save(commit=False)
+            app = form.save()
             app.distroseries = distroseries
             app.save()
             app.update_departments()

=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2012-04-18 21:27:46 +0000
+++ src/webcatalog/tests/test_commands.py	2012-04-19 21:37:20 +0000
@@ -411,6 +411,27 @@
         firefox = Application.objects.get(package_name='firefox')
         self.assertEqual(self.FIREFOX_DESCRIPTION, firefox.description)
 
+    def test_process_desktop_file_with_screenshot_url(self):
+        """When processing a desktop file, handle if screenshot_url is set."""
+        command = import_app_install_data.Command()
+        desktop_file = tempfile.mktemp()
+        self.addCleanup(os.remove, desktop_file)
+
+        with open(desktop_file, 'w') as f:
+            f.write("""[Desktop Entry]
+X-AppInstall-Package=foo
+X-AppInstall-Popcon=149803
+X-AppInstall-Section=main
+Version=1.0
+Name=Foo Bar Baz
+X-AppInstall-Screenshot-Url=http://foo.com
+X-Ubuntu-Gettext-Domain=app-install-data
+""")
+
+        distroseries = self.factory.make_distroseries()
+        command.process_desktop_file(desktop_file, '', distroseries)
+        # no breakage!
+
 
 class ImportForPurchaseAppsTestCase(TestCaseWithFactory):