Merge lp:~mvo/software-center/lp971776 into lp:software-center

[Michael Vogt]

Fix crash when a image downloaded is invalid for whatever reason (network issues, proxy issues, pay-wall in between). This is the top #5 bug on the software-center errors.ubuntu.com subpage.

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-01 19:14:37 +0000
+++ debian/changelog	2012-06-05 07:22:19 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 software-center (5.3.0) quantal; urgency=low
 
   [ Robert Roth ]
@@ -38,6 +39,9 @@
  -- Michael Vogt <[e-mail]>  Fri, 01 Jun 2012 19:54:38 +0200
 
 software-center (5.2.3) UNRELEASEDprecise-proposed; urgency=low
+=======
+software-center (5.2.3) precise-proposed; urgency=low
+>>>>>>> MERGE-SOURCE
 
   [ Robert Roth ]
   * lp:~evfool/software-center/lp987801:
@@ -98,7 +102,7 @@
     - Filtered out those exhibits that do not their packages available 
       in the db (LP: #986563)
 
- -- Michael Vogt <[e-mail]>  Thu, 31 May 2012 10:07:45 +0200
+ -- Michael Vogt <[e-mail]>  Mon, 04 Jun 2012 08:53:25 +0200
 
 software-center (5.2.2.2) precise-proposed; urgency=low
 

=== modified file 'softwarecenter/ui/gtk3/models/appstore2.py'
--- softwarecenter/ui/gtk3/models/appstore2.py	2012-05-22 14:36:03 +0000
+++ softwarecenter/ui/gtk3/models/appstore2.py	2012-06-05 07:22:19 +0000
@@ -121,27 +121,32 @@
         else:
             self.icon_cache = {}
 
+    def _on_image_download_complete(self, downloader, image_file_path, pkgname):
+        LOG.debug("download for '%s' complete" % image_file_path)
+        try:
+            pb = GdkPixbuf.Pixbuf.new_from_file_at_size(image_file_path,
+                                                        self.icon_size,
+                                                        self.icon_size)
+        except GObject.GError as e:
+            LOG.warn("Failed to get image file for '%s' (%s)", 
+                     image_file_path, e)
+            return
+        # replace the icon in the icon_cache now that we've got the real
+        # one
+        icon_file = split_icon_ext(os.path.basename(image_file_path))
+        self.icon_cache[icon_file] = pb
+        self.emit("needs-refresh", pkgname)
+
     def _download_icon_and_show_when_ready(self, url, pkgname, icon_file_name):
         LOG.debug("did not find the icon locally, must download %s" %
             icon_file_name)
 
-        def on_image_download_complete(downloader, image_file_path, pkgname):
-            LOG.debug("download for '%s' complete" % image_file_path)
-            pb = GdkPixbuf.Pixbuf.new_from_file_at_size(icon_file_path,
-                                                        self.icon_size,
-                                                        self.icon_size)
-            # replace the icon in the icon_cache now that we've got the real
-            # one
-            icon_file = split_icon_ext(os.path.basename(image_file_path))
-            self.icon_cache[icon_file] = pb
-            self.emit("needs-refresh", pkgname)
-
         if url is not None:
             icon_file_path = os.path.join(SOFTWARE_CENTER_ICON_CACHE_DIR,
                 icon_file_name)
             image_downloader = SimpleFileDownloader()
             image_downloader.connect('file-download-complete',
-                on_image_download_complete, pkgname)
+                                     self._on_image_download_complete, pkgname)
             image_downloader.download_file(url, icon_file_path)
 
     @property

=== modified file 'test/gtk3/test_appstore2.py'
--- test/gtk3/test_appstore2.py	2012-05-18 05:47:10 +0000
+++ test/gtk3/test_appstore2.py	2012-06-05 07:22:19 +0000
@@ -4,7 +4,7 @@
 import xapian
 
 from gi.repository import Gtk
-from mock import patch
+from mock import Mock, patch
 
 from testutils import setup_test_env
 setup_test_env()
@@ -16,13 +16,14 @@
                                       get_test_gtk3_icon_cache,
                                       )
 
-class TestAppstore(unittest.TestCase):
+class AppStoreTestCase(unittest.TestCase):
     """ test the appstore """
 
-    def setUp(self):
-        self.cache = get_test_pkg_info()
-        self.icons = get_test_gtk3_icon_cache()
-        self.db = get_test_db()
+    @classmethod
+    def setUpClass(cls):
+        cls.cache = get_test_pkg_info()
+        cls.icons = get_test_gtk3_icon_cache()
+        cls.db = get_test_db()
 
     def test_lp872760(self):
         def monkey_(s):
@@ -68,9 +69,15 @@
         # ensure clear works
         model.clear()
         self.assertEqual(model.current_matches, None)
-        
+    
+    def test_lp971776(self):
+        """ ensure that refresh is not called for invalid image files """
+        model = AppListStore(self.db, self.cache, self.icons)
+        model.emit = Mock()
+        model._on_image_download_complete(None, "xxx", "software-center")
+        self.assertFalse(model.emit.called)
 
 if __name__ == "__main__":
-    import logging
-    logging.basicConfig(level=logging.DEBUG)
+    #import logging
+    #logging.basicConfig(level=logging.DEBUG)
     unittest.main()

=== modified file 'test/gtk3/test_catview.py'
--- test/gtk3/test_catview.py	2012-06-01 19:14:37 +0000
+++ test/gtk3/test_catview.py	2012-06-05 07:22:19 +0000
@@ -115,7 +115,11 @@
 class RecommendationsTestCase(CatViewBaseTestCase):
     """The test suite for the recommendations ."""
 
+<<<<<<< TREE
     # FIXME: reenable
+=======
+    @unittest.skip("Disabled because of race condition in test")
+>>>>>>> MERGE-SOURCE
     @patch('softwarecenter.backend.recagent.RecommenderAgent.is_opted_in')
     def disabled_test_recommended_for_you_opt_in_display(
                                         self, mock_get_recommender_opted_in):
@@ -128,7 +132,11 @@
                          FramedHeaderBox.CONTENT)
         self.assertTrue(self.rec_panel.opt_in_vbox.get_property("visible"))
 
+<<<<<<< TREE
     # FIXME: reenable
+=======
+    @unittest.skip("Disabled because of race condition in test")
+>>>>>>> MERGE-SOURCE
     # patch out the agent query method to avoid making the actual server call
     @patch('softwarecenter.backend.recagent.RecommenderAgent.is_opted_in')
     @patch('softwarecenter.backend.recagent.RecommenderAgent'

=== modified file 'test/test_package_info.py'
--- test/test_package_info.py	2012-01-16 14:42:49 +0000
+++ test/test_package_info.py	2012-06-05 07:22:19 +0000
@@ -65,6 +65,7 @@
         pkginfo = self.pkginfo
         self.assertTrue(len(pkginfo.get_addons("firefox")) > 0)
 
+    @unittest.skip("disabled due to invalid fixture data")
     def test_removal(self):
         pkginfo = self.pkginfo
         pkg = pkginfo['coreutils']