chore: fix additional tests

Author: vchudnov-g

tests/asyncio/test_grpc_helpers_async.py

@@ -522,11 +522,15 @@ def test_create_channel_explicit_with_duplicate_credentials():
     target = "example:443"
 
     with pytest.raises(exceptions.DuplicateCredentialArgs) as excinfo:
-        grpc_helpers_async.create_channel(
-            target,
-            credentials_file="credentials.json",
-            credentials=mock.sentinel.credentials,
-        )
+        with pytest.warns(
+            DeprecationWarning,
+            match="argument is deprecated because of a potential security risk",
+        ):
+            grpc_helpers_async.create_channel(
+                target,
+                credentials_file="credentials.json",
+                credentials=mock.sentinel.credentials,
+            )
 
     assert "mutually exclusive" in str(excinfo.value)
 
@@ -641,9 +645,13 @@ def test_create_channel_with_credentials_file(
     credentials_file = "/path/to/credentials/file.json"
     composite_creds = composite_creds_call.return_value
 
-    channel = grpc_helpers_async.create_channel(
-        target, credentials_file=credentials_file
-    )
+    with pytest.warns(
+        DeprecationWarning,
+        match="argument is deprecated because of a potential security risk",
+    ):
+        channel = grpc_helpers_async.create_channel(
+            target, credentials_file=credentials_file
+        )
 
     google.auth.load_credentials_from_file.assert_called_once_with(
         credentials_file, scopes=None, default_scopes=None
@@ -670,9 +678,13 @@ def test_create_channel_with_credentials_file_and_scopes(
     credentials_file = "/path/to/credentials/file.json"
     composite_creds = composite_creds_call.return_value
 
-    channel = grpc_helpers_async.create_channel(
-        target, credentials_file=credentials_file, scopes=scopes
-    )
+    with pytest.warns(
+        DeprecationWarning,
+        match="argument is deprecated because of a potential security risk",
+    ):
+        channel = grpc_helpers_async.create_channel(
+            target, credentials_file=credentials_file, scopes=scopes
+        )
 
     google.auth.load_credentials_from_file.assert_called_once_with(
         credentials_file, scopes=scopes, default_scopes=None
@@ -699,9 +711,13 @@ def test_create_channel_with_credentials_file_and_default_scopes(
     credentials_file = "/path/to/credentials/file.json"
     composite_creds = composite_creds_call.return_value
 
-    channel = grpc_helpers_async.create_channel(
-        target, credentials_file=credentials_file, default_scopes=default_scopes
-    )
+    with pytest.warns(
+        DeprecationWarning,
+        match="argument is deprecated because of a potential security risk",
+    ):
+        channel = grpc_helpers_async.create_channel(
+            target, credentials_file=credentials_file, default_scopes=default_scopes
+        )
 
     google.auth.load_credentials_from_file.assert_called_once_with(
         credentials_file, scopes=None, default_scopes=default_scopes

tests/unit/operations_v1/test_operations_rest_client.py

@@ -369,7 +369,11 @@ def test_operations_client_client_options(
         )
 
     # Check the case credentials_file is provided
-    options = client_options.ClientOptions(credentials_file="credentials.json")
+    with pytest.warns(
+        DeprecationWarning,
+        match="argument is deprecated because of a potential security risk",
+    ):
+        options = client_options.ClientOptions(credentials_file="credentials.json")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
         client = client_class(client_options=options, transport=transport_name)
@@ -539,7 +543,11 @@ def test_operations_client_client_options_credentials_file(
     client_class, transport_class, transport_name
 ):
     # Check the case credentials file is provided.
-    options = client_options.ClientOptions(credentials_file="credentials.json")
+    with pytest.warns(
+        DeprecationWarning,
+        match="argument is deprecated because of a potential security risk",
+    ):
+        options = client_options.ClientOptions(credentials_file="credentials.json")
     if "async" in str(client_class):
         # TODO(): Add support for credentials file to async REST transport.
         with pytest.raises(core_exceptions.AsyncRestUnsupportedParameterError):
@@ -570,10 +578,21 @@ def test_operations_client_client_options_credentials_file(
     return_value=(mock.sentinel.credentials, mock.sentinel.project),
 )
 def test_list_operations_rest(google_auth_default, credentials_file):
-    sync_transport = transports.rest.OperationsRestTransport(
-        credentials_file=credentials_file,
-        http_options=HTTP_OPTIONS,
-    )
+    if credentials_file:
+        with pytest.warns(
+            DeprecationWarning,
+            match="argument is deprecated because of a potential security risk",
+        ):
+            sync_transport = transports.rest.OperationsRestTransport(
+                credentials_file=credentials_file,
+                http_options=HTTP_OPTIONS,
+            )
+    else:
+        # no warning expected
+        sync_transport = transports.rest.OperationsRestTransport(
+            credentials_file=credentials_file,
+            http_options=HTTP_OPTIONS,
+        )
 
     client = AbstractOperationsClient(transport=sync_transport)
 
@@ -1130,10 +1149,14 @@ def test_transport_adc(client_class, transport_class, credentials):
 def test_operations_base_transport_error():
     # Passing both a credentials object and credentials_file should raise an error
     with pytest.raises(core_exceptions.DuplicateCredentialArgs):
-        transports.OperationsTransport(
-            credentials=ga_credentials.AnonymousCredentials(),
-            credentials_file="credentials.json",
-        )
+        with pytest.warns(
+            DeprecationWarning,
+            match="argument is deprecated because of a potential security risk",
+        ):
+            transports.OperationsTransport(
+                credentials=ga_credentials.AnonymousCredentials(),
+                credentials_file="credentials.json",
+            )
 
 
 def test_operations_base_transport():
@@ -1171,10 +1194,14 @@ def test_operations_base_transport_with_credentials_file():
     ) as Transport:
         Transport.return_value = None
         load_creds.return_value = (ga_credentials.AnonymousCredentials(), None)
-        transports.OperationsTransport(
-            credentials_file="credentials.json",
-            quota_project_id="octopus",
-        )
+        with pytest.warns(
+            DeprecationWarning,
+            match="argument is deprecated because of a potential security risk",
+        ):
+            transports.OperationsTransport(
+                credentials_file="credentials.json",
+                quota_project_id="octopus",
+            )
         load_creds.assert_called_once_with(
             "credentials.json",
             scopes=None,

tests/unit/test_grpc_helpers.py

@@ -581,11 +581,15 @@ def test_create_channel_explicit_with_duplicate_credentials():
     target = "example.com:443"
 
     with pytest.raises(exceptions.DuplicateCredentialArgs):
-        grpc_helpers.create_channel(
-            target,
-            credentials_file="credentials.json",
-            credentials=mock.sentinel.credentials,
-        )
+        with pytest.warns(
+            DeprecationWarning,
+            match="argument is deprecated because of a potential security risk",
+        ):
+            grpc_helpers.create_channel(
+                target,
+                credentials_file="credentials.json",
+                credentials=mock.sentinel.credentials,
+            )
 
 
 @mock.patch("grpc.compute_engine_channel_credentials")
@@ -710,7 +714,11 @@ def test_create_channel_with_credentials_file(
     credentials_file = "/path/to/credentials/file.json"
     composite_creds = composite_creds_call.return_value
 
-    channel = grpc_helpers.create_channel(target, credentials_file=credentials_file)
+    with pytest.warns(
+        DeprecationWarning,
+        match="argument is deprecated because of a potential security risk",
+    ):
+        channel = grpc_helpers.create_channel(target, credentials_file=credentials_file)
 
     google.auth.load_credentials_from_file.assert_called_once_with(
         credentials_file, scopes=None, default_scopes=None
@@ -742,9 +750,13 @@ def test_create_channel_with_credentials_file_and_scopes(
     credentials_file = "/path/to/credentials/file.json"
     composite_creds = composite_creds_call.return_value
 
-    channel = grpc_helpers.create_channel(
-        target, credentials_file=credentials_file, scopes=scopes
-    )
+    with pytest.warns(
+        DeprecationWarning,
+        match="argument is deprecated because of a potential security risk",
+    ):
+        channel = grpc_helpers.create_channel(
+            target, credentials_file=credentials_file, scopes=scopes
+        )
 
     google.auth.load_credentials_from_file.assert_called_once_with(
         credentials_file, scopes=scopes, default_scopes=None
@@ -776,9 +788,13 @@ def test_create_channel_with_credentials_file_and_default_scopes(
     credentials_file = "/path/to/credentials/file.json"
     composite_creds = composite_creds_call.return_value
 
-    channel = grpc_helpers.create_channel(
-        target, credentials_file=credentials_file, default_scopes=default_scopes
-    )
+    with pytest.warns(
+        DeprecationWarning,
+        match="argument is deprecated because of a potential security risk",
+    ):
+        channel = grpc_helpers.create_channel(
+            target, credentials_file=credentials_file, default_scopes=default_scopes
+        )
 
     load_credentials_from_file.assert_called_once_with(
         credentials_file, scopes=None, default_scopes=default_scopes