Merge lp:~mandel/ubuntu-sso-client/fix_no_creds_windows into lp:ubuntu-sso-client

[Manuel de la Peña]

Fixes lp:746096 the bug by ensuring that we do not try to load a json object from None.

Fixes lp:746096 the bug by ensuring that we do not try to load a json object from None.

[Shane Fagan (shanepatrickfagan)]

tested on windows trivial enough

review: Approve

[Eric Casteleijn (thisfred)]

review: Approve

[Eric Casteleijn (thisfred)]

Although:

"""Test geting the credentials."""

should be:

"""Test getting the credentials."""

;)

[lp:~mandel/ubuntu-sso-client/fix_no_creds_windows]

694. By Manuel de la Peña on 2011-04-01

Fixed typo.

=== modified file 'ubuntu_sso/keyring/tests/test_windows.py'
--- ubuntu_sso/keyring/tests/test_windows.py	2011-03-18 09:30:20 +0000
+++ ubuntu_sso/keyring/tests/test_windows.py	2011-04-01 08:15:52 +0000
@@ -44,7 +44,7 @@
 
     @inlineCallbacks
     def test_get_credentials(self):
-        """Test deleting the credentials."""
+        """Test getting the credentials."""
         app_name = 'name'
         password = dict(password='password')
         self.keyring_lib.get_password(app_name, USERNAME)
@@ -54,6 +54,16 @@
         self.assertEqual(password, result)
 
     @inlineCallbacks
+    def test_get_credentials_not_present(self):
+        """Test getting creds that are not present."""
+        app_name = 'name'
+        self.keyring_lib.get_password(app_name, USERNAME)
+        self.mocker.result(None)
+        self.mocker.replay()
+        result = yield self.keyring.get_credentials(app_name)
+        self.assertEqual(None, result)
+
+    @inlineCallbacks
     def test_delete_credentials(self):
         """Test deleting the credentials."""
         app_name = 'name'
 
=== modified file 'ubuntu_sso/keyring/windows.py'
--- ubuntu_sso/keyring/windows.py	2011-03-09 20:05:41 +0000
+++ ubuntu_sso/keyring/windows.py	2011-04-01 08:15:52 +0000
@@ -44,7 +44,8 @@
     def _get_credentials_obj(self, app_name):
         """A dict with the credentials."""
         creds = self.keyring.get_password(app_name, USERNAME)
-        return loads(creds)
+        if creds:
+            return loads(creds)
 
     def get_credentials(self, app_name):
         """A deferred with the secret of the SSO item in a dictionary."""