fix unitests

Author: lionelz

async_hvac/tests/test_approle_routes.py

@@ -9,6 +9,8 @@
 class TestApproleRoutes(TestCase):
     """Unit tests providing coverage for approle auth backend-related methods/routes."""
 
+
+
     @parameterized.expand([
         ("default mount point", None, "application1"),
         ("custom mount point", "my-approle-path", "application2"),
@@ -40,6 +42,7 @@ async def test_create_role(self, test_label, mount_point, role_name, requests_mo
             first=expected_status_code,
             second=actual_response.status,
         )
+        await client.close()
 
     @parameterized.expand([
         ("default mount point", None, "application1"),
@@ -81,6 +84,7 @@ async def test_list_roles(self, test_label, mount_point, role_name, requests_moc
 
         # ensure we received our mock response data back successfully
         self.assertEqual(mock_response, actual_response)
+        await client.close()
 
     @parameterized.expand([
         ("default mount point", None, "application1", "40b3c82d-12a6-838c-9e74-1f1133867e06"),
@@ -127,6 +131,7 @@ async def test_get_role_id(self, test_label, mount_point, role_name, role_id, re
             first=role_id,
             second=actual_response
         )
+        await client.close()
 
     @parameterized.expand([
         ("default mount point", None, "application1", "custom-role-id-1"),
@@ -157,10 +162,11 @@ async def test_set_role_id(self, test_label, mount_point, role_name, role_id, re
                 mount_point=mount_point,
             )
 
-        self.assertEquals(
+        self.assertEqual(
             first=expected_status_code,
             second=actual_response.status,
         )
+        await client.close()
 
     @parameterized.expand([
         ("default mount point", None, "application1"),
@@ -212,10 +218,11 @@ async def test_get_role(self, test_label, mount_point, role_name, requests_mocke
                 mount_point=mount_point,
             )
 
-        self.assertEquals(
+        self.assertEqual(
             first=mock_response,
             second=actual_response,
         )
+        await client.close()
 
     @parameterized.expand([
         ("default mount point", None, "application1"),
@@ -259,10 +266,11 @@ async def test_create_role_secret_id(self, test_label, mount_point, role_name, r
                 mount_point=mount_point,
             )
 
-        self.assertEquals(
+        self.assertEqual(
             first=mock_response,
             second=actual_response,
         )
+        await client.close()
 
     @parameterized.expand([
         ("default mount point", None, "application1", "be78e3ca-f644-b099-3291-e8a6f5985cfe"),
@@ -314,10 +322,11 @@ async def test_get_role_secret_id(self, test_label, mount_point, role_name, secr
                 mount_point=mount_point,
             )
 
-        self.assertEquals(
+        self.assertEqual(
             first=mock_response,
             second=actual_response,
         )
+        await client.close()
 
     @parameterized.expand([
         ("default mount point", None, "application1", "be78e3ca-f644-b099-3291-e8a6f5985cfe"),
@@ -362,10 +371,11 @@ async def test_list_role_secrets(self, test_label, mount_point, role_name, secre
                 mount_point=mount_point,
             )
 
-        self.assertEquals(
+        self.assertEqual(
             first=mock_response,
             second=actual_response,
         )
+        await client.close()
 
     @parameterized.expand([
         ("default mount point", None, "application1", "be78e3ca-f644-b099-3291-e8a6f5985cfe"),
@@ -417,10 +427,11 @@ async def test_get_role_secret_id_accessor(self, test_label, mount_point, role_n
                 mount_point=mount_point,
             )
 
-        self.assertEquals(
+        self.assertEqual(
             first=mock_response,
             second=actual_response,
         )
+        await client.close()
 
     @parameterized.expand([
         ("default mount point", None, "application1", "be78e3ca-f644-b099-3291-e8a6f5985cfe"),
@@ -452,10 +463,11 @@ async def test_delete_role_secret_id(self, test_label, mount_point, role_name, s
                 mount_point=mount_point,
             )
 
-        self.assertEquals(
+        self.assertEqual(
             first=expected_status_code,
             second=actual_response.status,
         )
+        await client.close()
 
     @parameterized.expand([
         ("default mount point", None, "application1", "be78e3ca-f644-b099-3291-e8a6f5985cfe"),
@@ -488,10 +500,11 @@ async def test_delete_role_secret_id_accessor(self, test_label, mount_point, rol
                 mount_point=mount_point,
             )
 
-        self.assertEquals(
+        self.assertEqual(
             first=expected_status_code,
             second=actual_response.status,
         )
+        await client.close()
 
     @parameterized.expand([
         ("default mount point", None, "application1", "be78e3ca-f644-b099-3291-e8a6f5985cfe"),
@@ -536,10 +549,11 @@ async def test_create_role_custom_secret_id(self, test_label, mount_point, role_
                 mount_point=mount_point,
             )
 
-        self.assertEquals(
+        self.assertEqual(
             first=mock_response,
             second=actual_response,
         )
+        await client.close()
 
     @parameterized.expand([
         ("default mount point", None, "c7f93182-c6b1-4b6a-9dfb-03bdb6df0026", "26089502-b7d3-412a-b3e6-3d44300f9bd1"),
@@ -595,3 +609,4 @@ async def test_auth_approle(self, test_label, mount_point, role_id, secret_id, r
             first=mock_response,
             second=actual_response,
         )
+        await client.close()

async_hvac/tests/test_auth_methods.py

@@ -30,7 +30,8 @@ async def test_tune_auth_backend(self, requests_mocker):
             second=actual_response.status,
         )
 
-        actual_request_params = requests_mocker.request_history[0].json()
+        actual_request_params = requests_mocker.requests[
+            ('post', 'http://127.0.0.1:8200/v1/sys/auth/{0}/tune'.format(test_mount_point))][0].kwargs['json']
 
         # Ensure we sent through an optional tune parameter as expected
         self.assertEqual(

async_hvac/tests/util.py

@@ -97,7 +97,6 @@ def match_version(spec):
 class RequestsMocker(aioresponses):
 
     def __init__(self):
-        self.request_history = []
         super(RequestsMocker, self).__init__()
 
     def register_uri(self, method='GET', url='', status_code=200, json=None):
@@ -111,4 +110,3 @@ def register_uri(self, method='GET', url='', status_code=200, json=None):
             req = self.post(url=url, status=status_code, body=json)
         if method == 'DELETE':
             req = self.delete(url=url, status=status_code, body=json)
-        self.request_history.append(req)

requirements-dev.txt

@@ -6,4 +6,5 @@ semantic_version
 avakas
 requests-mock
 aioresponses
-mock
+mock
+parameterized