Merge lp:~elopio/cloudspacesclient/dev_server into lp:cloudspacesclient

[Leo Arias]

Get the server adapter class from the config file.
Added an adapter for UbuntuOne with an existing user instead of creating a new one.

[lp:~elopio/cloudspacesclient/dev_server]

28. By Leo Arias on 2013-12-04

Added tests for the ubuntuone with existent user adapter.

29. By Leo Arias on 2013-12-04

Added the missing test.

[Richard Huddie (rhuddie)]

Looks good.

review: Approve

[lp:~elopio/cloudspacesclient/dev_server]

30. By Leo Arias on 2013-12-04

Revert change on config.

=== modified file 'src/cloudspacesclient/config/cloudspaces.conf'
--- src/cloudspacesclient/config/cloudspaces.conf	2013-12-04 14:35:17 +0000
+++ src/cloudspacesclient/config/cloudspaces.conf	2013-12-04 14:54:10 +0000
@@ -1,6 +1,7 @@
 [cloudspaces]
 cloudspaces_server_url = http://u1.local:8003
 #cloudspaces_server_url = http://u1-precise.local:8003
+cloudspaces_server_adapter = cloudspacesclient.ubuntuone.UbuntuOneServer
 
 [ubuntuone]
 sso_server_url = http://sso.local:8001

=== modified file 'src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py'
--- src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py	2013-12-04 14:34:33 +0000
+++ src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py	2013-12-04 14:54:10 +0000
@@ -17,6 +17,7 @@
 
 """Conformance tests for Cloudspaces API."""
 
+import importlib
 import os
 import unittest
 import urllib.parse
@@ -27,7 +28,15 @@
 import cloudspacer.errors
 from dateutil import parser, tz
 
-from cloudspacesclient import config, schemas, ubuntuone
+from cloudspacesclient import config, schemas
+
+
+def get_test_server_adapter():
+    test_server_adapter = config.get(
+        'cloudspaces', 'cloudspaces_server_adapter').split('.')
+    test_server_module_name = '.'.join(test_server_adapter[:-1])
+    test_server_module = importlib.import_module(test_server_module_name)
+    return getattr(test_server_module, test_server_adapter[-1])()
 
 
 class CloudspacesAPITestCase(unittest.TestCase):
@@ -38,9 +47,7 @@
     def setUp(self):
         super(CloudspacesAPITestCase, self).setUp()
         self.start_datetime = self._get_now_datetime()
-        # TODO the server class should be defined in a config file, to make
-        # it easy to test different Cloudspaces servers.
-        self.test_server = ubuntuone.UbuntuOneServer()
+        self.test_server = get_test_server_adapter()
         self.test_user = self.test_server.create_test_user()
         self.addCleanup(self.test_server.delete_test_user, self.test_user)
 

=== modified file 'src/cloudspacesclient/tests/unit/test_ubuntuone.py'
--- src/cloudspacesclient/tests/unit/test_ubuntuone.py	2013-11-29 08:43:04 +0000
+++ src/cloudspacesclient/tests/unit/test_ubuntuone.py	2013-12-04 14:54:10 +0000
@@ -175,6 +175,61 @@
             str(e.exception), 'Failed to create U1 user. Test error')
 
 
+class UbuntuOneServerWithExistingUserTestCase(unittest.TestCase):
+
+    def setUp(self):
+        super(UbuntuOneServerWithExistingUserTestCase, self).setUp()
+        self.server = ubuntuone.UbuntuOneServerWithExistingUser()
+
+    def test_create_test_user_should_not_create_unique_user(self):
+        with mock.patch.object(
+                ubuntuone.User, 'make_unique') as mock_make_user:
+            self.server.create_test_user()
+
+        self.assertFalse(mock_make_user.called)
+
+    def test_create_test_user_should_not_register_user_in_sso(self):
+        with mock.patch.object(
+                ubuntuone.UbuntuOneServerWithExistingUser,
+                '_register_test_user') as mock_register:
+            self.server.create_test_user()
+
+        self.assertFalse(mock_register.called)
+
+    def test_create_test_user_should_not_create_user_in_u1(self):
+        with mock.patch.object(
+                ubuntuone.UbuntuOneServerWithExistingUser,
+                '_create_user_in_u1') as mock_create_in_u1:
+            self.server.create_test_user()
+
+        self.assertFalse(mock_create_in_u1.called)
+
+    def test_get_auth_session_should_return_values_from_config(self):
+        def config_side_effect(section, option):
+            if section == 'ubuntuone':
+                test_options = {
+                    'consumer_key': 'test consumer key',
+                    'consumer_secret': 'test consumer secret',
+                    'token_key': 'test token key',
+                    'token_secret': 'test token secret'
+                }
+                return test_options.get(option)
+
+        with mock.patch('cloudspacesclient.config.get') as config_mock:
+            config_mock.side_effect = config_side_effect
+            session = self.server.get_auth_session('dummy')
+
+        self.assertIsInstance(session, requests_oauthlib.OAuth1Session)
+        self.assertEqual(
+            session._client.client.client_key, 'test consumer key')
+        self.assertEqual(
+            session._client.client.client_secret, 'test consumer secret')
+        self.assertEqual(
+            session._client.client.resource_owner_key, 'test token key')
+        self.assertEqual(
+            session._client.client.resource_owner_secret, 'test token secret')
+
+
 class UbuntuOneAPITestCase(unittest.TestCase):
 
     def setUp(self):

=== modified file 'src/cloudspacesclient/ubuntuone.py'
--- src/cloudspacesclient/ubuntuone.py	2013-11-29 08:43:57 +0000
+++ src/cloudspacesclient/ubuntuone.py	2013-12-04 14:54:10 +0000
@@ -136,6 +136,21 @@
         return ['~/Ubuntu One']
 
 
+class UbuntuOneServerWithExistingUser(UbuntuOneServer):
+
+    def create_test_user(self, unique_id=None):
+        # Ignore this, we will use an existing user.
+        pass
+
+    def get_auth_session(self, user):
+        """Return the auth session of the existing user."""
+        return requests_oauthlib.OAuth1Session(
+            config.get('ubuntuone', 'consumer_key'),
+            config.get('ubuntuone', 'consumer_secret'),
+            config.get('ubuntuone', 'token_key'),
+            config.get('ubuntuone', 'token_secret'))
+
+
 class UbuntuOneAPIClient(object):
 
     content_type = JSON_MIME_TYPE