Merge lp:~mvo/software-center/reinstall-previous-purchase-token-fix into lp:software-center

[Michael Vogt]

This branch fixes reinstall previous purchases that contain a system wide license key. LP: #1065481

[lp:~mvo/software-center/reinstall-previous-purchase-token-fix]

3231. By Michael Vogt on 2012-10-11

tests/gtk3/test_appmanager.py: ensure that the ApplicationManager has a valid oauth token

[Dave Morley (davmor2)]

I've tested this is functioning on a real app reinstall. Main doesn't work, however using this branch does. Indicating that this branch fixes the issue for reinstalling applications that have License Keys.

review: Approve (reinstalled an app using this branch)

=== modified file 'softwarecenter/ui/gtk3/session/appmanager.py'
--- softwarecenter/ui/gtk3/session/appmanager.py	2012-09-14 15:01:37 +0000
+++ softwarecenter/ui/gtk3/session/appmanager.py	2012-10-11 12:35:33 +0000
@@ -26,6 +26,7 @@
 
 from gi.repository import GObject
 
+from softwarecenter.backend.ubuntusso import UbuntuSSO
 from softwarecenter.enums import AppActions
 from softwarecenter.db import DebFileApplication
 from softwarecenter.distro import get_current_arch, get_distro
@@ -59,7 +60,10 @@
         self.backend = backend
         self.distro = get_distro()
         self.icons = icons
-        self.oauth_token = ""
+        # its ok to use the sync version here to get the token, this is
+        # very quick
+        helper = UbuntuSSO()
+        self.oauth_token = helper.find_oauth_token_sync()
 
     def _globalise_instance(self):
         global _appmanager
 
=== modified file 'tests/gtk3/test_appmanager.py'
--- tests/gtk3/test_appmanager.py	2012-08-20 09:09:45 +0000
+++ tests/gtk3/test_appmanager.py	2012-10-11 12:35:33 +0000
@@ -1,6 +1,9 @@
 import unittest
 
-from mock import Mock
+from mock import (
+    Mock,
+    patch,
+    )
 
 from tests.utils import (
     do_events,
@@ -76,5 +79,18 @@
     def _on_purchase_requested(self, *args):
         self._purchase_requested_signal = True
 
+    def test_appmanager_requests_oauth_token(self):
+        oauth_token = { "moo": "bar",
+                        "lala": "la",
+                        }
+        # reset the global appmanager
+        softwarecenter.ui.gtk3.session.appmanager._appmanager = None
+        with patch("softwarecenter.ui.gtk3.session.appmanager.UbuntuSSO"
+                   ".find_oauth_token_sync") as m:
+            m.return_value = oauth_token
+            app_manager = ApplicationManager(self.db, self.backend, self.icons)
+            self.assertEqual(app_manager.oauth_token, oauth_token)
+
+
 if __name__ == "__main__":
     unittest.main()