Merge pull request #2394 from dhermes/move-test-helpers

Moving test _helpers back into library.

unit_tests/bigquery/test_table.py

@@ -1465,7 +1465,7 @@ def test_upload_from_file_multipart_w_400(self):
         import csv
         import datetime
         from six.moves.http_client import BAD_REQUEST
-        from unit_tests._testing import _NamedTemporaryFile
+        from google.cloud._testing import _NamedTemporaryFile
         from google.cloud._helpers import UTC
         from google.cloud.exceptions import BadRequest
         WHEN_TS = 1437767599.006
@@ -1495,7 +1495,7 @@ def _upload_from_file_helper(self, **kw):
         import datetime
         from six.moves.http_client import OK
         from google.cloud._helpers import UTC
-        from unit_tests._testing import _NamedTemporaryFile
+        from google.cloud._testing import _NamedTemporaryFile
         from google.cloud.bigquery.table import SchemaField
 
         WHEN_TS = 1437767599.006
@@ -1604,8 +1604,8 @@ def test_upload_from_file_resumable_with_400(self):
         from google.cloud.bigquery import table as MUT
         from google.cloud.exceptions import BadRequest
         from google.cloud._helpers import UTC
-        from unit_tests._testing import _Monkey
-        from unit_tests._testing import _NamedTemporaryFile
+        from google.cloud._testing import _Monkey
+        from google.cloud._testing import _NamedTemporaryFile
         WHEN_TS = 1437767599.006
         WHEN = datetime.datetime.utcfromtimestamp(WHEN_TS).replace(
             tzinfo=UTC)
@@ -1643,7 +1643,7 @@ def test_upload_from_file_w_explicit_client_resumable(self):
         from six.moves.http_client import OK
         from six.moves.urllib.parse import parse_qsl
         from six.moves.urllib.parse import urlsplit
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigquery import table as MUT
 
         UPLOAD_PATH = 'https://example.com/upload/test'

unit_tests/bigtable/test_client.py

@@ -23,7 +23,7 @@ def _callFUT(self, client):
         return _make_data_stub(client)
 
     def test_without_emulator(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import client as MUT
 
         credentials = _Credentials()
@@ -51,7 +51,7 @@ def mock_make_secure_stub(*args):
         ])
 
     def test_with_emulator(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import client as MUT
 
         emulator_host = object()
@@ -83,7 +83,7 @@ def _callFUT(self, client):
         return _make_instance_stub(client)
 
     def test_without_emulator(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import client as MUT
 
         credentials = _Credentials()
@@ -111,7 +111,7 @@ def mock_make_secure_stub(*args):
         ])
 
     def test_with_emulator(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import client as MUT
 
         emulator_host = object()
@@ -143,7 +143,7 @@ def _callFUT(self, client):
         return _make_operations_stub(client)
 
     def test_without_emulator(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import client as MUT
 
         credentials = _Credentials()
@@ -171,7 +171,7 @@ def mock_make_secure_stub(*args):
         ])
 
     def test_with_emulator(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import client as MUT
 
         emulator_host = object()
@@ -203,7 +203,7 @@ def _callFUT(self, client):
         return _make_table_stub(client)
 
     def test_without_emulator(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import client as MUT
 
         credentials = _Credentials()
@@ -231,7 +231,7 @@ def mock_make_secure_stub(*args):
         ])
 
     def test_with_emulator(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import client as MUT
 
         emulator_host = object()
@@ -271,7 +271,7 @@ def _makeOne(self, *args, **kwargs):
         return self._getTargetClass()(*args, **kwargs)
 
     def _makeOneWithMocks(self, *args, **kwargs):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import client as MUT
 
         mock_make_data_stub = _MakeStubMock()
@@ -287,7 +287,7 @@ def _makeOneWithMocks(self, *args, **kwargs):
     def _constructor_test_helper(self, expected_scopes, creds,
                                  read_only=False, admin=False,
                                  user_agent=None, expected_creds=None):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import client as MUT
 
         user_agent = user_agent or MUT.DEFAULT_USER_AGENT
@@ -373,7 +373,7 @@ def test_constructor_both_admin_and_read_only(self):
                                           read_only=True)
 
     def test_constructor_implicit_credentials(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import client as MUT
 
         creds = _Credentials()
@@ -392,7 +392,7 @@ def test_constructor_credentials_wo_create_scoped(self):
         self._constructor_test_helper(expected_scopes, creds)
 
     def _copy_test_helper(self, read_only=False, admin=False):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import client as MUT
 
         credentials = _Credentials('value')

unit_tests/bigtable/test_row.py

@@ -343,7 +343,7 @@ def test_commit(self):
         self.assertEqual(row._pb_mutations, [])
 
     def test_commit_too_many_mutations(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import row as MUT
 
         row_key = b'row_key'
@@ -481,7 +481,7 @@ def test_commit(self):
         self.assertEqual(row._false_pb_mutations, [])
 
     def test_commit_too_many_mutations(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import row as MUT
 
         row_key = b'row_key'
@@ -572,7 +572,7 @@ def test_increment_cell_value(self):
         self.assertEqual(row._rule_pb_list, [expected_pb])
 
     def test_commit(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from unit_tests.bigtable._testing import _FakeStub
         from google.cloud.bigtable import row as MUT
 
@@ -646,7 +646,7 @@ def test_commit_no_rules(self):
         self.assertEqual(stub.method_calls, [])
 
     def test_commit_too_many_mutations(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.bigtable import row as MUT
 
         row_key = b'row_key'

unit_tests/bigtable/test_table.py

@@ -267,7 +267,7 @@ def test_delete(self):
         )])
 
     def _read_row_helper(self, chunks, expected_result):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from unit_tests.bigtable._testing import _FakeStub
         from google.cloud.bigtable import table as MUT
 
@@ -347,7 +347,7 @@ def test_read_row_still_partial(self):
             self._read_row_helper(chunks, None)
 
     def test_read_rows(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from unit_tests.bigtable._testing import _FakeStub
         from google.cloud.bigtable.row_data import PartialRowsData
         from google.cloud.bigtable import table as MUT

unit_tests/datastore/test_client.py

@@ -39,7 +39,7 @@ def _callFUT(self):
 
     def test_no_value(self):
         import os
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
 
         environ = {}
         with _Monkey(os, getenv=environ.get):
@@ -48,7 +48,7 @@ def test_no_value(self):
 
     def test_value_set(self):
         import os
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.datastore.client import GCD_DATASET
 
         MOCK_PROJECT = object()
@@ -67,7 +67,7 @@ def _callFUT(self, project=None):
 
     def _determine_default_helper(self, gcd=None, fallback=None,
                                   project_called=None):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.datastore import client
 
         _callers = []
@@ -140,7 +140,7 @@ def _makeOne(self, project=PROJECT, namespace=None,
                                       http=http)
 
     def test_ctor_w_project_no_environ(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.datastore import client as _MUT
 
         # Some environments (e.g. AppVeyor CI) run in GCE, so
@@ -149,7 +149,7 @@ def test_ctor_w_project_no_environ(self):
             self.assertRaises(EnvironmentError, self._makeOne, None)
 
     def test_ctor_w_implicit_inputs(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.datastore import client as _MUT
         from google.cloud import client as _base_client
 
@@ -494,7 +494,7 @@ def test_get_multi_hit_multiple_keys_different_project(self):
             client.get_multi([key1, key2])
 
     def test_get_multi_max_loops(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.datastore import client as _MUT
         from google.cloud.datastore.key import Key
 
@@ -702,7 +702,7 @@ def test_key_w_project(self):
 
     def test_key_wo_project(self):
         from google.cloud.datastore import client as MUT
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
 
         KIND = 'KIND'
         ID = 1234
@@ -723,7 +723,7 @@ def test_key_wo_project(self):
 
     def test_key_w_namespace(self):
         from google.cloud.datastore import client as MUT
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
 
         KIND = 'KIND'
         ID = 1234
@@ -744,7 +744,7 @@ def test_key_w_namespace(self):
 
     def test_key_w_namespace_collision(self):
         from google.cloud.datastore import client as MUT
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
 
         KIND = 'KIND'
         ID = 1234
@@ -766,7 +766,7 @@ def test_key_w_namespace_collision(self):
 
     def test_batch(self):
         from google.cloud.datastore import client as MUT
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
 
         creds = object()
         client = self._makeOne(credentials=creds)
@@ -780,7 +780,7 @@ def test_batch(self):
 
     def test_transaction_defaults(self):
         from google.cloud.datastore import client as MUT
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
 
         creds = object()
         client = self._makeOne(credentials=creds)
@@ -812,7 +812,7 @@ def test_query_w_project(self):
 
     def test_query_w_defaults(self):
         from google.cloud.datastore import client as MUT
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
 
         creds = object()
         client = self._makeOne(credentials=creds)
@@ -830,7 +830,7 @@ def test_query_w_defaults(self):
 
     def test_query_explicit(self):
         from google.cloud.datastore import client as MUT
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
 
         KIND = 'KIND'
         NAMESPACE = 'NAMESPACE'
@@ -870,7 +870,7 @@ def test_query_explicit(self):
 
     def test_query_w_namespace(self):
         from google.cloud.datastore import client as MUT
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
 
         KIND = 'KIND'
         NAMESPACE = object()
@@ -892,7 +892,7 @@ def test_query_w_namespace(self):
 
     def test_query_w_namespace_collision(self):
         from google.cloud.datastore import client as MUT
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
 
         KIND = 'KIND'
         NAMESPACE1 = object()

unit_tests/datastore/test_connection.py

@@ -113,7 +113,7 @@ def _getTargetClass(self):
         return _DatastoreAPIOverGRPC
 
     def _makeOne(self, stub, connection=None, secure=True, mock_args=None):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.datastore import connection as MUT
 
         if connection is None:
@@ -316,7 +316,7 @@ def _make_query_pb(self, kind):
         return pb
 
     def _makeOne(self, credentials=None, http=None, use_grpc=False):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.datastore import connection as MUT
         with _Monkey(MUT, _USE_GRPC=use_grpc):
             return self._getTargetClass()(credentials=credentials, http=http)
@@ -336,7 +336,7 @@ def test_default_url(self):
 
     def test_custom_url_from_env(self):
         import os
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.connection import API_BASE_URL
         from google.cloud.environment_vars import GCD_HOST
 
@@ -354,7 +354,7 @@ def test_ctor_defaults(self):
         self.assertIsNone(conn.credentials)
 
     def test_ctor_without_grpc(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.datastore import connection as MUT
 
         connections = []
@@ -372,7 +372,7 @@ def mock_api(connection):
         self.assertEqual(connections, [conn])
 
     def test_ctor_with_grpc(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.datastore import connection as MUT
 
         api_args = []
@@ -866,7 +866,7 @@ def test_begin_transaction(self):
         request.ParseFromString(cw['body'])
 
     def test_commit_wo_transaction(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.datastore._generated import datastore_pb2
         from google.cloud.datastore import connection as MUT
         from google.cloud.datastore.helpers import _new_value_pb
@@ -912,7 +912,7 @@ def mock_parse(response):
         self.assertEqual(_parsed, [rsp_pb])
 
     def test_commit_w_transaction(self):
-        from unit_tests._testing import _Monkey
+        from google.cloud._testing import _Monkey
         from google.cloud.datastore._generated import datastore_pb2
         from google.cloud.datastore import connection as MUT
         from google.cloud.datastore.helpers import _new_value_pb