Merge lp:~mvo/software-center/fix-lp1011522 into lp:software-center/5.2

[Michael Vogt]

This branch fixes bug #1011522. To test:
- run software-center
- click on reinstall-previous purchases
- wait until the data is available
- click on reinstall-previous-purchases again
- a spinner appears and never goes away

This branch fixes that behavior.

[Gary Lasker (gary-lasker)]

Nice simple fix, thanks!

review: Approve

=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py	2012-06-01 17:51:05 +0000
+++ softwarecenter/ui/gtk3/app.py	2012-06-27 08:26:28 +0000
@@ -882,12 +882,14 @@
     def on_menuitem_reinstall_purchases_activate(self, menuitem):
         self.view_manager.set_active_view(ViewPages.AVAILABLE)
         self.view_manager.search_entry.clear_with_no_signal()
-        self.available_pane.show_appview_spinner()
         if self.available_for_me_query:
             # we already have the list of available items, so just show it
+            # (no need for spinner here)
             self.available_pane.on_previous_purchases_activated(
                     self.available_for_me_query)
         else:
+            # show spinner as this may take some time
+            self.available_pane.show_appview_spinner()
             # fetch the list of available items and show it
             self._create_scagent_if_needed()
             self._login_via_dbus_sso()

=== modified file 'test/gtk3/test_app.py'
--- test/gtk3/test_app.py	2012-05-21 20:10:39 +0000
+++ test/gtk3/test_app.py	2012-06-27 08:26:28 +0000
@@ -5,17 +5,23 @@
 
 from collections import defaultdict
 from functools import partial
-
-from mock import Mock
-
-from testutils import FakedCache, get_mock_options, setup_test_env
+import xapian
+
+from mock import Mock, patch
+
+from testutils import (
+    FakedCache,
+    get_mock_options,
+    setup_test_env,
+    do_events_with_sleep,
+    )
 setup_test_env()
 
 import softwarecenter.paths
 from softwarecenter.db import DebFileApplication, DebFileOpenError
 from softwarecenter.enums import PkgStates, SearchSeparators
 from softwarecenter.ui.gtk3 import app
-
+from softwarecenter.ui.gtk3.widgets.spinner import SpinnerNotebook
 
 class ParsePackagesArgsTestCase(unittest.TestCase):
     """Test suite for the parse_packages_args helper."""
@@ -315,6 +321,19 @@
 
     installed = True
 
+class MenuTestCase(AppTestCase):
+    """ Test case for the menus """
+
+    def test_reinstall_previous_purchases_lp1011522(self):
+        # pretend we have the available_for_me data (much quicker
+        # than to do a real s-c-agent query for this)
+        self.app.available_for_me_query = xapian.Query()
+        self.app.on_menuitem_reinstall_purchases_activate(None)
+        do_events_with_sleep()
+        self.assertEqual(
+            self.app.available_pane.spinner_notebook.get_current_page(),
+            SpinnerNotebook.CONTENT_PAGE)
+
 
 if __name__ == "__main__":
     # avoid spawning recommender-agent, reviews, software-center-agent etc,