Update tests from #2682.

Author: daspecster

speech/unit_tests/test_client.py

@@ -230,7 +230,7 @@ def make_channel(*args):
  return channel_obj
 
  def speech_api(channel=None):
- return _MockGAPICSpeechAPI(response=self._make_sync_response(),
+ return _MockGAPICSpeechAPI(response=_make_sync_response(),
  channel=channel)
 
  host = 'foo.apis.invalid'
@@ -284,7 +284,7 @@ def make_channel(*args):
 
  def speech_api(channel=None):
  return _MockGAPICSpeechAPI(
- response=self._make_sync_response(result),
+ response=_make_sync_response(result),
  channel=channel)
 
  host = 'foo.apis.invalid'
@@ -424,16 +424,27 @@ def test_streaming_closed_stream(self):
  client.connection = _Connection()
  client.connection.credentials = credentials
 
- def speech_api():
- return _MockGAPICSpeechAPI(client)
+ channel_args = []
+ channel_obj = object()
+
+ def make_channel(*args):
+ channel_args.append(args)
+ return channel_obj
+
+ def speech_api(channel=None):
+ return _MockGAPICSpeechAPI(channel=channel)
+
+ host = 'foo.apis.invalid'
+ speech_api.SERVICE_ADDRESS = host
 
  stream.close()
 
  sample = client.sample(content=stream,
  encoding=Encoding.LINEAR16,
  sample_rate=self.SAMPLE_RATE)
 
- with _Monkey(_gax, SpeechApi=speech_api):
+ with _Monkey(_gax, SpeechApi=speech_api,
+ make_secure_channel=make_channel):
  client._speech_api = _gax.GAPICSpeechAPI(client)
 
  with self.assertRaises(ValueError):
@@ -465,10 +476,21 @@ def test_stream_recognize_interim_results(self):
  _make_sync_response(result),
  _make_sync_response(result)]
 
- def speech_api():
-  return _MockGAPICSpeechAPI(responses)
+ channel_args = []
+ channel_obj = object()
 
- with _Monkey(_gax, SpeechApi=speech_api):
+ def make_channel(*args):
+ channel_args.append(args)
+ return channel_obj
+
+ def speech_api(channel=None):
+ return _MockGAPICSpeechAPI(channel=channel, response=responses)
+
+ host = 'foo.apis.invalid'
+ speech_api.SERVICE_ADDRESS = host
+
+ with _Monkey(_gax, SpeechApi=speech_api,
+ make_secure_channel=make_channel):
  client._speech_api = _gax.GAPICSpeechAPI(client)
 
  sample = client.sample(content=stream,
@@ -503,8 +525,18 @@ def test_stream_recognize(self):
 
  responses = [_make_sync_response()]
 
- def speech_api():
- return _MockGAPICSpeechAPI(responses)
+ channel_args = []
+ channel_obj = object()
+
+ def make_channel(*args):
+ channel_args.append(args)
+ return channel_obj
+
+ def speech_api(channel=None):
+ return _MockGAPICSpeechAPI(channel=channel, response=responses)
+
+ host = 'foo.apis.invalid'
+ speech_api.SERVICE_ADDRESS = host
 
  with _Monkey(_gax, SpeechApi=speech_api):
  client._speech_api = _gax.GAPICSpeechAPI(client)
@@ -532,10 +564,21 @@ def test_stream_recognize_no_results(self):
 
  responses = [_make_sync_response()]
 
- def speech_api():
-  return _MockGAPICSpeechAPI(responses)
+ channel_args = []
+ channel_obj = object()
 
- with _Monkey(_gax, SpeechApi=speech_api):
+ def make_channel(*args):
+ channel_args.append(args)
+ return channel_obj
+
+ def speech_api(channel=None):
+ return _MockGAPICSpeechAPI(channel=channel, response=responses)
+
+ host = 'foo.apis.invalid'
+ speech_api.SERVICE_ADDRESS = host
+
+ with _Monkey(_gax, SpeechApi=speech_api,
+ make_secure_channel=make_channel):
  client._speech_api = _gax.GAPICSpeechAPI(client)
 
  sample = client.sample(content=stream,