Remove pending deprecation spew from unit tests.

showcase/python/nox.py

@@ -36,7 +36,7 @@ def showcase(session, py):
     session.virtualenv_dirname = 'showcase-' + py
 
     # Install all test dependencies, then install this package in-place.
-    session.install('pytest')
+    session.install('pytest', 'mock')
     session.install('--pre', 'googleapis-common-protos')
     session.install(
         '-e',

src/main/java/com/google/api/codegen/transformer/py/PythonImportSectionTransformer.java

@@ -224,7 +224,10 @@ private List<ImportFileView> generateProtoImports(
   }
 
   private List<ImportFileView> generateTestStandardImports() {
-    return ImmutableList.of(createImport("pytest"));
+    ImmutableList.Builder<ImportFileView> imports = ImmutableList.builder();
+    imports.add(createImport("mock"));
+    imports.add(createImport("pytest"));
+    return imports.build();
   }
 
   private List<ImportFileView> generateSmokeTestStandardImports(boolean requireProjectId) {

src/main/resources/com/google/api/codegen/py/main.snip

@@ -70,8 +70,7 @@
             @end
         @end
         def __init__(self, transport=None, channel=None, credentials=None,
-                client_config={@api.clientConfigName}.config,
-                client_info=None):
+                client_config=None, client_info=None):
             """Constructor.
 
             Args:
@@ -103,12 +102,16 @@
                     your own client library.
             """
             @# Raise deprecation warnings for things we want to go away.
-            if client_config:
+            if client_config is not None:
                 warnings.warn('The `client_config` argument is deprecated.',
-                              PendingDeprecationWarning)
+                              PendingDeprecationWarning, stacklevel=2)
+            else:
+                client_config = {@api.clientConfigName}.config
+
             if channel:
                 warnings.warn('The `channel` argument is deprecated; use '
-                              '`transport` instead.', PendingDeprecationWarning)
+                              '`transport` instead.',
+                              PendingDeprecationWarning, stacklevel=2)
 
             @# Instantiate the transport.
             @# The transport is responsible for handling serialization and

src/main/resources/com/google/api/codegen/py/nox.py.snip

@@ -43,7 +43,7 @@
         session.virtualenv_dirname = 'unit-' + py
 
         @# Install all test dependencies, then install this package in-place.
-        session.install('pytest')
+        session.install('pytest', 'mock')
         session.install('-e', '.')
 
         @# Run py.test against the unit tests.

src/main/resources/com/google/api/codegen/py/test.snip

@@ -173,8 +173,7 @@ class CustomException(Exception):
 
         @# Mock the API response
         channel = ChannelStub(responses = [iter([expected_response])])
-        client = {@moduleName}.{@test.serviceConstructorName}(
-            channel=channel)
+        {@clientSetup(test, moduleName)}
 
         @# Setup Request
         {@initCode(test.initCode.lines)}
@@ -256,8 +255,7 @@ class CustomException(Exception):
     def {@test.nameWithException}(self):
         @# Mock the API response
         channel = ChannelStub(responses = [CustomException()])
-        client = {@moduleName}.{@test.serviceConstructorName}(
-             channel=channel)
+        {@clientSetup(test, moduleName)}
 
         @if test.hasRequestParameters
             @# Setup request
@@ -271,8 +269,7 @@ class CustomException(Exception):
 @private pagedStreamingTestWithException(test, moduleName)
     def {@test.nameWithException}(self):
         channel = ChannelStub(responses = [CustomException()])
-        client = {@moduleName}.{@test.serviceConstructorName}(
-            channel=channel)
+        {@clientSetup(test, moduleName)}
 
         @if test.hasRequestParameters
             @# Setup request
@@ -288,8 +285,7 @@ class CustomException(Exception):
     def {@test.nameWithException}(self):
         @# Mock the API response
         channel = ChannelStub(responses = [CustomException()])
-        client = {@moduleName}.{@test.serviceConstructorName}(
-             channel=channel)
+        {@clientSetup(test, moduleName)}
 
         @if test.hasRequestParameters
             @# Setup request
@@ -312,8 +308,7 @@ class CustomException(Exception):
 
         @# Mock the API response
         channel = ChannelStub(responses=[operation])
-        client = {@moduleName}.{@test.serviceConstructorName}(
-            channel=channel)
+        {@clientSetup(test, moduleName)}
 
         @if test.hasRequestParameters
             @# Setup Request
@@ -336,8 +331,7 @@ class CustomException(Exception):
 
         @# Mock the API response
         channel = ChannelStub(responses=[operation])
-        client = {@moduleName}.{@test.serviceConstructorName}(
-            channel=channel)
+        {@clientSetup(test, moduleName)}
 
         @if test.hasRequestParameters
             @# Setup Request
@@ -350,8 +344,10 @@ class CustomException(Exception):
 @end
 
 @private clientSetup(test, moduleName)
-    client = {@moduleName}.{@test.serviceConstructorName}(
-        channel=channel)
+        patch = mock.patch('google.cloud.api_core.grpc_helpers.create_channel')
+        with patch as create_channel:
+            create_channel.return_value = channel
+            client = {@moduleName}.{@test.serviceConstructorName}()
 @end
 
 @private responseInitCode(test)