Merge pull request #2725 from daspecster/drop-monkey-for-mock-in-moni…

…toring Swap _Monkey for mock.patch().
googleapis · Nov 14, 2016 · 945a221 · 945a221
2 parents 2f49740 + f8e9679
commit 945a221
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/monitoring/tox.ini b/monitoring/tox.ini
@@ -8,6 +8,7 @@ localdeps =
 deps =
     {toxinidir}/../core
     pytest
+    mock
 covercmd =
     py.test --quiet \
       --cov=google.cloud.monitoring \

diff --git a/monitoring/unit_tests/test_client.py b/monitoring/unit_tests/test_client.py
@@ -185,8 +185,7 @@ def test_resource_factory(self):
 
     def test_timeseries_factory_gauge(self):
         import datetime
-        from google.cloud._testing import _Monkey
-        import google.cloud.monitoring.client
+        import mock
         from google.cloud._helpers import _datetime_to_rfc3339
         METRIC_TYPE = 'custom.googleapis.com/my_metric'
         METRIC_LABELS = {
@@ -222,7 +221,8 @@ def test_timeseries_factory_gauge(self):
         TIME2_STR = _datetime_to_rfc3339(TIME2, ignore_zone=False)
         # Construct a time series assuming a gauge metric using the current
         # time
-        with _Monkey(google.cloud.monitoring.client, _UTCNOW=lambda: TIME2):
+        with mock.patch('google.cloud.monitoring.client._UTCNOW',
+                        new=lambda: TIME2):
             timeseries_no_end = client.time_series(metric, resource, VALUE)
 
         self.assertEqual(timeseries_no_end.points[0].end_time, TIME2_STR)

diff --git a/monitoring/unit_tests/test_query.py b/monitoring/unit_tests/test_query.py
@@ -130,8 +130,7 @@ def test_constructor_maximal(self):
 
     def test_constructor_default_end_time(self):
         import datetime
-        from google.cloud._testing import _Monkey
-        from google.cloud.monitoring import query as MUT
+        import mock
 
         MINUTES = 5
         NOW, T0, T1 = [
@@ -141,7 +140,8 @@ def test_constructor_default_end_time(self):
         ]
 
         client = _Client(project=PROJECT, connection=_Connection())
-        with _Monkey(MUT, _UTCNOW=lambda: NOW):
+        with mock.patch('google.cloud.monitoring.query._UTCNOW',
+                        new=lambda: NOW):
             query = self._make_one(client, METRIC_TYPE, minutes=MINUTES)
 
         self.assertEqual(query._start_time, T0)