Merge lp:~diegosarmentero/ubuntu-sso-client/no-mocker2 into lp:ubuntu-sso-client

[Diego Sarmentero]

Migrated keyring module to No Mocker.

Migrated keyring module to No Mocker.

[Roberto Alsina (ralsina)]

+1

review: Approve (code review only)

[Natalia Bidart (nataliabidart)]

== Python Lint Notices ==

ubuntu_sso/keyring/tests/test_windows.py:
    77: [E1103, TestWindowsKeyring.test_set_credentials] Instance of 'Deferred' has no 'data' member (but some types could not be inferred)

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/no-mocker2]

802. By Diego Sarmentero on 2011-10-13

Fixed lint issues.

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

=== modified file 'ubuntu_sso/keyring/tests/test_windows.py'
--- ubuntu_sso/keyring/tests/test_windows.py	2011-04-01 08:12:51 +0000
+++ ubuntu_sso/keyring/tests/test_windows.py	2011-10-13 12:08:23 +0000
@@ -17,57 +17,88 @@
 """Test the windows keyring implementation."""
 
 from json import dumps
-from mocker import MockerTestCase
-from twisted.internet.defer import inlineCallbacks
+
 from twisted.trial.unittest import TestCase
 
-from ubuntu_sso.keyring.windows import Keyring, USERNAME
-
-
-class TestWindowsKeyring(MockerTestCase, TestCase):
+from ubuntu_sso.keyring import windows
+
+
+class FakePyKeyring(object):
+
+    """Fake Keyring"""
+
+    def __init__(self):
+        """Initialize object."""
+        self.data = {}
+
+    def set_password(self, *args):
+        """Fake set_password for keyring."""
+        self.data['set_password'] = args
+        self.data['app_name'] = args[0][0]
+        return self
+
+    def get_password(self, app_name, username):
+        """Fake get_password."""
+        self.data['get_password'] = True
+        password = dict(password='password', app_name=app_name)
+        return dumps(password)
+
+    def delete_password(self, *args):
+        """Fake delete_password."""
+        self.data['delete_password'] = True
+
+
+class FakeDefer(object):
+
+    """Fake Deferred."""
+
+    def fake_defer_to_thread(self, func, *args):
+        """Fake deferToThread."""
+        return func(args)
+
+
+class TestWindowsKeyring(TestCase):
     """Test the windows keyring implementation."""
 
     def setUp(self):
         """Setup  tests."""
         super(TestWindowsKeyring, self).setUp()
-        self.keyring_lib = self.mocker.mock()
-        self.keyring = Keyring(self.keyring_lib)
+        self.app_name = 'app_name'
+        self.fake_keyring = FakePyKeyring()
+        self.keyring = windows.Keyring(self.fake_keyring)
+        self.fake_defer = FakeDefer()
+        self.patch(windows, "deferToThread",
+            self.fake_defer.fake_defer_to_thread)
 
-    @inlineCallbacks
+    # pylint: disable=E1103
     def test_set_credentials(self):
         """Test setting the credentials."""
-        app_name = 'name'
-        password = dict(password='password')
-        self.keyring_lib.set_password(app_name, USERNAME, dumps(password))
-        self.mocker.replay()
-        yield self.keyring.set_credentials(app_name, password)
+        self.keyring = windows.Keyring(self.fake_keyring)
+        d = self.keyring.set_credentials(self.app_name, 'password')
+        self.assertEqual(d.data['set_password'],
+            (('app_name', 'ubuntu_sso', '"password"'), ))
 
-    @inlineCallbacks
     def test_get_credentials(self):
         """Test getting the credentials."""
-        app_name = 'name'
-        password = dict(password='password')
-        self.keyring_lib.get_password(app_name, USERNAME)
-        self.mocker.result(dumps(password))
-        self.mocker.replay()
-        result = yield self.keyring.get_credentials(app_name)
-        self.assertEqual(password, result)
+        d = self.keyring.get_credentials(self.app_name)
+        self.assertTrue('password' in d)
+        self.assertEqual(d['password'], 'password')
+        self.assertTrue('app_name' in d)
+        self.assertEqual(d['app_name'], ['app_name'])
+        self.assertTrue(self.fake_keyring.data.get('get_password', False))
 
-    @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)
+        d = self.keyring.get_credentials('app_name_not_there')
+        self.assertTrue('password' in d)
+        self.assertEqual(d['password'], 'password')
+        self.assertTrue('app_name' in d)
+        self.assertNotEqual(d['app_name'], [self.app_name])
+        self.assertTrue(self.fake_keyring.data.get('get_password', False))
 
-    @inlineCallbacks
     def test_delete_credentials(self):
         """Test deleting the credentials."""
-        app_name = 'name'
-        self.keyring_lib.delete_password(app_name, USERNAME)
-        self.mocker.replay()
-        result = yield self.keyring.delete_credentials(app_name)
+        result = self.keyring.delete_credentials(self.app_name)
         self.assertTrue(result is None)
+        self.assertTrue(self.fake_keyring.data.get('delete_password', False))
+    # pylint: enable=E1103