fixed 3.7 test errors

Author: daniel-sanche

tests/compute_engine/test_credentials.py

@@ -1307,7 +1307,7 @@ def test_get_id_token_from_metadata(
         )
         cred.refresh(request=mock.Mock())
 
-        assert get.call_args.kwargs["headers"] == {
+        assert get.call_args[1]["headers"] == {
             "x-goog-api-client": ID_TOKEN_REQUEST_METRICS_HEADER_VALUE
         }
 

tests/oauth2/test_webauthn_handler.py

@@ -107,7 +107,7 @@ def test_success_get_assertion(os_get_stub, subprocess_run_stub):
     os_get_stub.assert_called_once()
     subprocess_run_stub.assert_called_once()
 
-    stdin_input = subprocess_run_stub.call_args.kwargs["input"]
+    stdin_input = subprocess_run_stub.call_args[1]["input"]
     input_json_len_le = stdin_input[:4]
     input_json_len = struct.unpack("<I", input_json_len_le)[0]
     input_json = stdin_input[4:]

tests/test__exponential_backoff.py

@@ -57,8 +57,12 @@ def test_minimum_total_attempts():
     _exponential_backoff.ExponentialBackoff(total_attempts=1)
 
 
+async def async_sleep(delay):
+    pass
+
+
 @pytest.mark.asyncio
-@mock.patch("asyncio.sleep", return_value=None)
+@mock.patch("asyncio.sleep", side_effect=async_sleep)
 async def test_exponential_backoff_async(mock_time_async):
     eb = _exponential_backoff.AsyncExponentialBackoff()
     curr_wait = eb._current_wait_in_seconds

tests/test_impersonated_credentials.py

@@ -344,7 +344,7 @@ def test_refresh_success(
         assert credentials.valid
         assert not credentials.expired
         assert (
-            request.call_args.kwargs["headers"]["x-goog-api-client"]
+            request.call_args[1]["headers"]["x-goog-api-client"]
             == ACCESS_TOKEN_REQUEST_METRICS_HEADER_VALUE
         )
 
@@ -1075,7 +1075,7 @@ def test_id_token_metrics(self, mock_donor_credentials):
                     ID_TOKEN_EXPIRY
                 )
                 assert (
-                    mock_post.call_args.kwargs["headers"]["x-goog-api-client"]
+                    mock_post.call_args[1]["headers"]["x-goog-api-client"]
                     == ID_TOKEN_REQUEST_METRICS_HEADER_VALUE
                 )
 
@@ -1145,9 +1145,11 @@ def _test_id_token_helper(
         id_creds = id_creds.from_credentials(target_credentials=target_credentials)
         id_creds.refresh(request)
 
-        args = mock_authorizedsession_idtoken.call_args.args
-
-        assert args[2] == expected_url
+        # In Python 3.7, self might not be in call_args for autospecced methods
+        args = mock_authorizedsession_idtoken.call_args[0]
+        
+        # Look for expected_url in args
+        assert expected_url in args
 
         assert id_creds.token == ID_TOKEN_DATA
         assert id_creds._include_email is True

tests/transport/aio/test_sessions.py

@@ -261,9 +261,12 @@ async def test_request_max_allowed_time_exceeded_error(self):
     @pytest.mark.parametrize("retry_status", DEFAULT_RETRYABLE_STATUS_CODES)
     @pytest.mark.asyncio
     async def test_request_max_retries(self, retry_status):
+        async def async_sleep(delay):
+            pass
+
         mocked_response = MockResponse(status_code=retry_status)
         auth_request = MockRequest(mocked_response)
-        with patch("asyncio.sleep", return_value=None):
+        with patch("asyncio.sleep", side_effect=async_sleep):
             authed_session = sessions.AsyncAuthorizedSession(
                 self.credentials, auth_request
             )

tests_async/oauth2/test__client_async.py

@@ -37,9 +37,13 @@ def make_request(response_data, status=http_client.OK, text=False):
     response = AsyncMock(spec=["transport.Response"])
     response.status = status
     data = response_data if text else json.dumps(response_data).encode("utf-8")
+
+    async def get_content(*args, **kwargs):
+        return data
+
     response.data = AsyncMock(spec=["__call__", "read"])
-    response.data.read = AsyncMock(spec=["__call__"], return_value=data)
-    response.content = AsyncMock(spec=["__call__"], return_value=data)
+    response.data.read = AsyncMock(spec=["__call__"], side_effect=get_content)
+    response.content = AsyncMock(spec=["__call__"], side_effect=get_content)
     request = AsyncMock(spec=["transport.Request"])
     request.return_value = response
     return request

tests_async/oauth2/test_id_token.py

@@ -38,9 +38,12 @@ def make_request(status, data=None):
 
     if data is not None:
         response.data = AsyncMock(spec=["__call__", "read"])
-        response.content = AsyncMock(
-            spec=["__call__"], return_value=json.dumps(data).encode("utf-8")
-        )
+        
+        async def get_content(*args, **kwargs):
+             return json.dumps(data).encode("utf-8")
+
+        response.data.read = AsyncMock(spec=["__call__"], side_effect=get_content)
+        response.content = AsyncMock(spec=["__call__"], side_effect=get_content)
 
     request = AsyncMock(spec=["transport.Request"])
     request.return_value = response