fixing tests

Author: daniel-sanche

setup.py

@@ -77,6 +77,7 @@
     # aiohttp < 3.10.0 which is a bug. Investigate and remove the pinned aiohttp version.
     "aiohttp < 3.10.0",
     "mock; python_version < '3.8'",
+    "asyncmock; python_version < '3.8'",
     "freezegun",
 ]
 

tests/test__exponential_backoff.py

@@ -12,12 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from unittest import mock
-try:
+import sys
+if sys.version_info >= (3, 8):
+    from unittest import mock
     from unittest.mock import AsyncMock
-except ImportError:
-    # Fallback for Python < 3.8
-    from mock import AsyncMock
+else:
+    import mock
+
+    try:
+        from mock import AsyncMock
+    except ImportError:
+        from asyncmock import AsyncMock
 
 import pytest  # type: ignore
 
@@ -100,4 +105,4 @@ def test_minimum_total_attempts_async():
         _exponential_backoff.AsyncExponentialBackoff(total_attempts=0)
     with pytest.raises(exceptions.InvalidValue):
         _exponential_backoff.AsyncExponentialBackoff(total_attempts=-1)
-    _exponential_backoff.AsyncExponentialBackoff(total_attempts=1)
+    _exponential_backoff.AsyncExponentialBackoff(total_attempts=1)

tests_async/oauth2/test__client_async.py

@@ -15,14 +15,20 @@
 import datetime
 import http.client as http_client
 import json
-from unittest import mock
-try:
-    from unittest.mock import AsyncMock
-except ImportError:
-    # Fallback for Python < 3.8
-    from mock import AsyncMock
+import sys
 import urllib
 
+if sys.version_info >= (3, 8):
+    from unittest import mock
+    from unittest.mock import AsyncMock
+else:
+    import mock
+
+    try:
+        from mock import AsyncMock
+    except ImportError:
+        from asyncmock import AsyncMock
+
 import freezegun
 import pytest  # type: ignore
 

tests_async/oauth2/test_credentials_async.py

@@ -17,12 +17,15 @@
 import os
 import pickle
 import sys
-from unittest import mock
-try:
+if sys.version_info >= (3, 8):
+    from unittest import mock
     from unittest.mock import AsyncMock
-except ImportError:
-    # Fallback for Python < 3.8
-    from mock import AsyncMock
+else:
+    import mock
+    try:
+        from mock import AsyncMock
+    except ImportError:
+        from asyncmock import AsyncMock
 
 import pytest  # type: ignore
 

tests_async/oauth2/test_id_token.py

@@ -14,11 +14,12 @@
 
 import json
 import os
-from unittest import mock
-try:
+import sys
+if sys.version_info >= (3, 8):
+    from unittest import mock
     from unittest.mock import AsyncMock
-except ImportError:
-    # Fallback for Python < 3.8
+else:
+    import mock
     from mock import AsyncMock
 
 import pytest  # type: ignore

tests_async/oauth2/test_service_account_async.py

@@ -13,12 +13,16 @@
 # limitations under the License.
 
 import datetime
-from unittest import mock
-try:
+import sys
+if sys.version_info >= (3, 8):
+    from unittest import mock
     from unittest.mock import AsyncMock
-except ImportError:
-    # Fallback for Python < 3.8
-    from mock import AsyncMock
+else:
+    import mock
+    try:
+        from mock import AsyncMock
+    except ImportError:
+        from asyncmock import AsyncMock
 
 import pytest  # type: ignore
 

tests_async/transport/test_aiohttp_requests.py

@@ -12,11 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from unittest import mock
-try:
+import sys
+if sys.version_info >= (3, 8):
+    from unittest import mock
     from unittest.mock import AsyncMock
-except ImportError:
-    from mock import AsyncMock
+else:
+    import mock
+
+    try:
+        from mock import AsyncMock
+    except ImportError:
+        from asyncmock import AsyncMock
 
 import aiohttp  # type: ignore
 from aioresponses import aioresponses, core  # type: ignore
@@ -44,7 +50,7 @@ def test__is_compressed_not(self):
 
     @pytest.mark.asyncio
     async def test_raw_content(self):
-        mock_response = mock.AsyncMock()
+        mock_response = AsyncMock()
         mock_response.content.read.return_value = mock.sentinel.read
         combined_response = aiohttp_requests._CombinedResponse(response=mock_response)
         raw_content = await combined_response.raw_content()
@@ -57,7 +63,7 @@ async def test_raw_content(self):
 
     @pytest.mark.asyncio
     async def test_content(self):
-        mock_response = mock.AsyncMock()
+        mock_response = AsyncMock()
         mock_response.content.read.return_value = mock.sentinel.read
         combined_response = aiohttp_requests._CombinedResponse(response=mock_response)
         content = await combined_response.content()
@@ -104,7 +110,7 @@ async def test_status_prop(self):
 
     @pytest.mark.asyncio
     async def test_data_prop(self):
-        mock_response = mock.AsyncMock()
+        mock_response = AsyncMock()
         mock_response.content.read.return_value = mock.sentinel.read
         response = aiohttp_requests._Response(mock_response)
         data = await response.data.read()