Merge pull request #312 from cloudant/311-fix-cloudant-bluemix-client

Fix client construction in cloudant_bluemix context manager

Author: smithsz

CHANGES.rst

@@ -1,5 +1,6 @@
 2.6.0 (Unreleased)
 ==================
+- [FIXED] Fixed client construction in ``cloudant_bluemix`` context manager.
 
 2.5.0 (2017-07-06)
 ==================

src/cloudant/__init__.py

@@ -122,8 +122,8 @@ def cloudant_bluemix(vcap_services, instance_name=None, **kwargs):
     """
     service = CloudFoundryService(vcap_services, instance_name)
     cloudant_session = Cloudant(
-        username=service.username,
-        password=service.password,
+        service.username,
+        service.password,
         url=service.url,
         **kwargs
     )

tests/unit/client_tests.py

@@ -30,7 +30,7 @@
 
 from requests import ConnectTimeout
 
-from cloudant import cloudant, couchdb, couchdb_admin_party
+from cloudant import cloudant, cloudant_bluemix, couchdb, couchdb_admin_party
 from cloudant.client import Cloudant, CouchDB
 from cloudant.error import CloudantArgumentError, CloudantClientException
 from cloudant.feed import Feed, InfiniteFeed
@@ -502,7 +502,31 @@ def test_cloudant_context_helper(self):
                 self.assertIsInstance(c.r_session, requests.Session)
         except Exception as err:
             self.fail('Exception {0} was raised.'.format(str(err)))
-    
+
+    def test_cloudant_bluemix_context_helper(self):
+        """
+        Test that the cloudant_bluemix context helper works as expected.
+        """
+        instance_name = 'Cloudant NoSQL DB-lv'
+        vcap_services = {'cloudantNoSQLDB': [{
+          'credentials': {
+            'username': self.user,
+            'password': self.pwd,
+            'host': '{0}.cloudant.com'.format(self.account),
+            'port': 443,
+            'url': self.url
+          },
+          'name': instance_name,
+        }]}
+
+        try:
+            with cloudant_bluemix(vcap_services, instance_name=instance_name) as c:
+                self.assertIsInstance(c, Cloudant)
+                self.assertIsInstance(c.r_session, requests.Session)
+                self.assertEquals(c.session()['userCtx']['name'], self.user)
+        except Exception as err:
+            self.fail('Exception {0} was raised.'.format(str(err)))
+
     def test_constructor_with_account(self):
         """
         Test instantiating a client object using an account name