Fix test and lint

Author: whu-lyft

confidant_client/__init__.py

@@ -509,7 +509,7 @@ def get_jwt(self, environment, resource_id, expiry):
         url = '{0}/v1/jwks/token'.format(self.config['url'])
         if resource_id:
             url += '/{0}'.format(resource_id)
-        
+
         if expiry:
             url += '/{0}'.format(expiry)
 

confidant_client/cli.py

@@ -801,7 +801,8 @@ def main():
             logging.exception('An unexpected general error occurred.')
     elif args.subcommand == 'get_jwt':
         try:
-            ret = client.get_jwt(args.environment, args.resource_id, args.expiry)
+            ret = client.get_jwt(args.environment, args.resource_id,
+                                 args.expiry)
         except Exception:
             logging.exception('An unexpected general error occurred.')
 

tests/unit/confidant_client/client_test.py

@@ -876,7 +876,7 @@ def test_get_jwt_no_resource(self):
         client.request_session.request = mock_200
 
         self.assertEqual(
-            client.get_jwt('development', None),
+            client.get_jwt('development', None, None),
             {'result': True}
         )
         client.request_session.request.assert_called_with(
@@ -901,7 +901,7 @@ def test_get_jwt(self):
         client.request_session.request = mock_200
 
         self.assertEqual(
-            client.get_jwt('development', 'test-resource'),
+            client.get_jwt('development', 'test-resource', None),
             {'result': True}
         )
         client.request_session.request.assert_called_with(
@@ -912,3 +912,28 @@ def test_get_jwt(self):
             timeout=5,
             params={'environment': 'development'},
         )
+
+    def test_get_jwt_creation(self):
+        client = confidant_client.ConfidantClient(
+            'http://localhost',
+            'alias/authnz-testing',
+            {'from': 'confidant-unittest',
+             'to': 'test',
+             'user_type': 'service'},
+        )
+        token_mock = MagicMock()
+        client._get_token = token_mock
+        client.request_session.request = mock_200
+
+        self.assertEqual(
+            client.get_jwt('development', 'test-resource', 3600),
+            {'result': True}
+        )
+        client.request_session.request.assert_called_with(
+            'GET',
+            'http://localhost/v1/jwks/token/test-resource/3600',
+            auth=('2/service/confidant-unittest', token_mock()),
+            allow_redirects=False,
+            timeout=5,
+            params={'environment': 'development'},
+        )