Revert of ts_mon: remove dependency on apiclient.

infra_libs/ts_mon/common/test/monitors_test.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import base64
 import os
 import tempfile
 import unittest
 
 import mock
@@ skipping 64 matching lines @@
                                    'mytopic')
 
     m_open.assert_called_once_with('/path/to/creds.p8.json', 'r')
     storage_inst.get.assert_called_once_with()
     creds.authorize.assert_called_once_with(http_mock)
     discovery.build.assert_called_once_with('pubsub', 'v1', http=http_mock)
     self.assertEquals(mon._topic, 'projects/myproject/topics/mytopic')
 
   @mock.patch('infra_libs.ts_mon.common.monitors.PubSubMonitor.'
               '_load_credentials', autospec=True)
-  @mock.patch('googleapiclient.discovery.build', autospec=True)
+  @mock.patch('apiclient.discovery.build', autospec=True)
   def test_send(self, _discovery, _load_creds):
     mon = monitors.PubSubMonitor('/path/to/creds.p8.json', 'myproject',
                                  'mytopic')
     mon._api = mock.MagicMock()
     topic = 'projects/myproject/topics/mytopic'
 
     metric1 = metrics_pb2.MetricsData(name='m1')
     mon.send(metric1)
     metric2 = metrics_pb2.MetricsData(name='m2')
     mon.send([metric1, metric2])
     collection = metrics_pb2.MetricsCollection(data=[metric1, metric2])
     mon.send(collection)
 
     def message(pb):
       pb = monitors.Monitor._wrap_proto(pb)
       return {'messages': [{'data': base64.b64encode(pb.SerializeToString())}]}
     publish = mon._api.projects.return_value.topics.return_value.publish
     publish.assert_has_calls([
         mock.call(topic=topic, body=message(metric1)),
         mock.call().execute(num_retries=5),
         mock.call(topic=topic, body=message([metric1, metric2])),
         mock.call().execute(num_retries=5),
         mock.call(topic=topic, body=message(collection)),
         mock.call().execute(num_retries=5),
         ])
 
   @mock.patch('infra_libs.ts_mon.common.monitors.PubSubMonitor.'
               '_load_credentials', autospec=True)
-  @mock.patch('googleapiclient.discovery.build', autospec=True)
+  @mock.patch('apiclient.discovery.build', autospec=True)
   def test_send_uninitialized(self, discovery, _load_creds):
     """Test initialization retry logic, and also un-instrumented http path."""
     discovery.side_effect = EnvironmentError()  # Fail initialization.
     mon = monitors.PubSubMonitor('/path/to/creds.p8.json', 'myproject',
                                  'mytopic', use_instrumented_http=False)
 
     metric1 = metrics_pb2.MetricsData(name='m1')
     mon.send(metric1)
     self.assertIsNone(mon._api)
 
@@ skipping 40 matching lines @@
     collection = metrics_pb2.MetricsCollection(data=[metric1, metric2])
     m.send(collection)
 
 
 class NullMonitorTest(unittest.TestCase):
 
   def test_send(self):
     m = monitors.NullMonitor()
     metric1 = metrics_pb2.MetricsData(name='m1')
     m.send(metric1)