From b990bfab8a761ea3c9e87de4a9b238e6d5db78d6 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 20 Sep 2016 10:48:55 -0700 Subject: [PATCH 1/9] Replacing assertTrue(isinstance(...)) with assertIsInstance. Did this using: https://gist.github.com/dhermes/57e29d96b17a4e1543b47bd2fcebfc07 NOTE: Some usage that span multiple lines are still not changed. --- unit_tests/bigquery/test_client.py | 22 +++++++-------- unit_tests/bigquery/test_dataset.py | 8 +++--- unit_tests/bigquery/test_query.py | 4 +-- unit_tests/bigtable/test_client.py | 4 +-- unit_tests/bigtable/test_cluster.py | 6 ++-- unit_tests/bigtable/test_column_family.py | 16 +++++------ unit_tests/bigtable/test_instance.py | 16 +++++------ unit_tests/bigtable/test_table.py | 8 +++--- unit_tests/datastore/test_client.py | 26 +++++++++--------- unit_tests/datastore/test_connection.py | 6 ++-- unit_tests/datastore/test_helpers.py | 6 ++-- unit_tests/datastore/test_key.py | 2 +- unit_tests/dns/test_client.py | 12 ++++---- unit_tests/dns/test_zone.py | 20 +++++++------- unit_tests/logging/test__gax.py | 22 +++++++-------- unit_tests/logging/test_client.py | 32 +++++++++++----------- unit_tests/logging/test_entries.py | 4 +-- unit_tests/logging/test_logger.py | 4 +-- unit_tests/pubsub/test_subscription.py | 4 +-- unit_tests/resource_manager/test_client.py | 8 +++--- unit_tests/storage/test_batch.py | 14 +++++----- unit_tests/storage/test_blob.py | 2 +- unit_tests/storage/test_bucket.py | 10 +++---- unit_tests/storage/test_client.py | 14 +++++----- unit_tests/streaming/test_exceptions.py | 4 +-- unit_tests/streaming/test_http_wrapper.py | 6 ++-- unit_tests/streaming/test_transfer.py | 12 ++++---- unit_tests/test__helpers.py | 8 +++--- unit_tests/test_client.py | 8 +++--- unit_tests/test_connection.py | 8 +++--- unit_tests/test_credentials.py | 2 +- unit_tests/test_exceptions.py | 6 ++-- unit_tests/test_operation.py | 6 ++-- unit_tests/translate/test_client.py | 4 +-- unit_tests/vision/test_client.py | 20 +++++++------- 35 files changed, 177 insertions(+), 177 deletions(-) diff --git a/unit_tests/bigquery/test_client.py b/unit_tests/bigquery/test_client.py index 44448d9deab6..5279c716f57d 100644 --- a/unit_tests/bigquery/test_client.py +++ b/unit_tests/bigquery/test_client.py @@ -30,7 +30,7 @@ def test_ctor(self): creds = _Credentials() http = object() client = self._makeOne(project=PROJECT, credentials=creds, http=http) - self.assertTrue(isinstance(client.connection, Connection)) + self.assertIsInstance(client.connection, Connection) self.assertTrue(client.connection.credentials is creds) self.assertTrue(client.connection.http is http) @@ -63,7 +63,7 @@ def test_list_projects_defaults(self): self.assertEqual(len(projects), len(DATA['projects'])) for found, expected in zip(projects, DATA['projects']): - self.assertTrue(isinstance(found, Project)) + self.assertIsInstance(found, Project) self.assertEqual(found.project_id, expected['id']) self.assertEqual(found.numeric_id, expected['numericId']) self.assertEqual(found.friendly_name, expected['friendlyName']) @@ -125,7 +125,7 @@ def test_list_datasets_defaults(self): self.assertEqual(len(datasets), len(DATA['datasets'])) for found, expected in zip(datasets, DATA['datasets']): - self.assertTrue(isinstance(found, Dataset)) + self.assertIsInstance(found, Dataset) self.assertEqual(found.dataset_id, expected['id']) self.assertEqual(found.friendly_name, expected['friendlyName']) self.assertEqual(token, TOKEN) @@ -165,7 +165,7 @@ def test_dataset(self): http = object() client = self._makeOne(project=PROJECT, credentials=creds, http=http) dataset = client.dataset(DATASET) - self.assertTrue(isinstance(dataset, Dataset)) + self.assertIsInstance(dataset, Dataset) self.assertEqual(dataset.name, DATASET) self.assertTrue(dataset._client is client) @@ -293,7 +293,7 @@ def test_list_jobs_defaults(self): self.assertEqual(len(jobs), len(DATA['jobs'])) for found, expected in zip(jobs, DATA['jobs']): name = expected['jobReference']['jobId'] - self.assertTrue(isinstance(found, JOB_TYPES[name])) + self.assertIsInstance(found, JOB_TYPES[name]) self.assertEqual(found.name, name) self.assertEqual(token, TOKEN) @@ -345,7 +345,7 @@ def test_list_jobs_load_job_wo_sourceUris(self): self.assertEqual(len(jobs), len(DATA['jobs'])) for found, expected in zip(jobs, DATA['jobs']): name = expected['jobReference']['jobId'] - self.assertTrue(isinstance(found, JOB_TYPES[name])) + self.assertIsInstance(found, JOB_TYPES[name]) self.assertEqual(found.name, name) self.assertEqual(token, TOKEN) @@ -394,7 +394,7 @@ def test_load_table_from_storage(self): dataset = client.dataset(DATASET) destination = dataset.table(DESTINATION) job = client.load_table_from_storage(JOB, destination, SOURCE_URI) - self.assertTrue(isinstance(job, LoadTableFromStorageJob)) + self.assertIsInstance(job, LoadTableFromStorageJob) self.assertTrue(job._client is client) self.assertEqual(job.name, JOB) self.assertEqual(list(job.source_uris), [SOURCE_URI]) @@ -414,7 +414,7 @@ def test_copy_table(self): source = dataset.table(SOURCE) destination = dataset.table(DESTINATION) job = client.copy_table(JOB, destination, source) - self.assertTrue(isinstance(job, CopyJob)) + self.assertIsInstance(job, CopyJob) self.assertTrue(job._client is client) self.assertEqual(job.name, JOB) self.assertEqual(list(job.sources), [source]) @@ -433,7 +433,7 @@ def test_extract_table_to_storage(self): dataset = client.dataset(DATASET) source = dataset.table(SOURCE) job = client.extract_table_to_storage(JOB, source, DESTINATION) - self.assertTrue(isinstance(job, ExtractTableToStorageJob)) + self.assertIsInstance(job, ExtractTableToStorageJob) self.assertTrue(job._client is client) self.assertEqual(job.name, JOB) self.assertEqual(job.source, source) @@ -448,7 +448,7 @@ def test_run_async_query(self): http = object() client = self._makeOne(project=PROJECT, credentials=creds, http=http) job = client.run_async_query(JOB, QUERY) - self.assertTrue(isinstance(job, QueryJob)) + self.assertIsInstance(job, QueryJob) self.assertTrue(job._client is client) self.assertEqual(job.name, JOB) self.assertEqual(job.query, QUERY) @@ -461,7 +461,7 @@ def test_run_sync_query(self): http = object() client = self._makeOne(project=PROJECT, credentials=creds, http=http) job = client.run_sync_query(QUERY) - self.assertTrue(isinstance(job, QueryResults)) + self.assertIsInstance(job, QueryResults) self.assertTrue(job._client is client) self.assertEqual(job.name, None) self.assertEqual(job.query, QUERY) diff --git a/unit_tests/bigquery/test_dataset.py b/unit_tests/bigquery/test_dataset.py index cc042e420e75..39985783e649 100644 --- a/unit_tests/bigquery/test_dataset.py +++ b/unit_tests/bigquery/test_dataset.py @@ -681,7 +681,7 @@ def test_list_tables_defaults(self): self.assertEqual(len(tables), len(DATA['tables'])) for found, expected in zip(tables, DATA['tables']): - self.assertTrue(isinstance(found, Table)) + self.assertIsInstance(found, Table) self.assertEqual(found.table_id, expected['id']) self.assertEqual(found.table_type, expected['type']) self.assertEqual(token, TOKEN) @@ -723,7 +723,7 @@ def test_list_tables_explicit(self): self.assertEqual(len(tables), len(DATA['tables'])) for found, expected in zip(tables, DATA['tables']): - self.assertTrue(isinstance(found, Table)) + self.assertIsInstance(found, Table) self.assertEqual(found.table_id, expected['id']) self.assertEqual(found.table_type, expected['type']) self.assertEqual(token, None) @@ -741,7 +741,7 @@ def test_table_wo_schema(self): client = _Client(project=self.PROJECT, connection=conn) dataset = self._makeOne(self.DS_NAME, client=client) table = dataset.table('table_name') - self.assertTrue(isinstance(table, Table)) + self.assertIsInstance(table, Table) self.assertEqual(table.name, 'table_name') self.assertTrue(table._dataset is dataset) self.assertEqual(table.schema, []) @@ -755,7 +755,7 @@ def test_table_w_schema(self): full_name = SchemaField('full_name', 'STRING', mode='REQUIRED') age = SchemaField('age', 'INTEGER', mode='REQUIRED') table = dataset.table('table_name', schema=[full_name, age]) - self.assertTrue(isinstance(table, Table)) + self.assertIsInstance(table, Table) self.assertEqual(table.name, 'table_name') self.assertTrue(table._dataset is dataset) self.assertEqual(table.schema, [full_name, age]) diff --git a/unit_tests/bigquery/test_query.py b/unit_tests/bigquery/test_query.py index be4b45b84fea..87b44d3d0e3f 100644 --- a/unit_tests/bigquery/test_query.py +++ b/unit_tests/bigquery/test_query.py @@ -78,7 +78,7 @@ def _verifySchema(self, query, resource): fields = resource['schema']['fields'] self.assertEqual(len(query.schema), len(fields)) for found, expected in zip(query.schema, fields): - self.assertTrue(isinstance(found, SchemaField)) + self.assertIsInstance(found, SchemaField) self.assertEqual(found.name, expected['name']) self.assertEqual(found.field_type, expected['type']) self.assertEqual(found.mode, expected['mode']) @@ -198,7 +198,7 @@ def test_job_w_jobid(self): 'jobId': SERVER_GENERATED, } job = query.job - self.assertTrue(isinstance(job, QueryJob)) + self.assertIsInstance(job, QueryJob) self.assertEqual(job.query, self.QUERY) self.assertTrue(job._client is client) self.assertEqual(job.name, SERVER_GENERATED) diff --git a/unit_tests/bigtable/test_client.py b/unit_tests/bigtable/test_client.py index 6da76065b70d..5874bf3089dc 100644 --- a/unit_tests/bigtable/test_client.py +++ b/unit_tests/bigtable/test_client.py @@ -517,7 +517,7 @@ def test_instance_factory_defaults(self): instance = client.instance(INSTANCE_ID, display_name=DISPLAY_NAME) - self.assertTrue(isinstance(instance, Instance)) + self.assertIsInstance(instance, Instance) self.assertEqual(instance.instance_id, INSTANCE_ID) self.assertEqual(instance.display_name, DISPLAY_NAME) self.assertEqual(instance._cluster_location_id, @@ -541,7 +541,7 @@ def test_instance_factory_w_explicit_serve_nodes(self): INSTANCE_ID, display_name=DISPLAY_NAME, location=LOCATION_ID, serve_nodes=SERVE_NODES) - self.assertTrue(isinstance(instance, Instance)) + self.assertIsInstance(instance, Instance) self.assertEqual(instance.instance_id, INSTANCE_ID) self.assertEqual(instance.display_name, DISPLAY_NAME) self.assertEqual(instance._cluster_location_id, LOCATION_ID) diff --git a/unit_tests/bigtable/test_cluster.py b/unit_tests/bigtable/test_cluster.py index 5f19ed13b9af..b3f601f9a356 100644 --- a/unit_tests/bigtable/test_cluster.py +++ b/unit_tests/bigtable/test_cluster.py @@ -109,7 +109,7 @@ def test_from_pb_success(self): klass = self._getTargetClass() cluster = klass.from_pb(cluster_pb, instance) - self.assertTrue(isinstance(cluster, klass)) + self.assertIsInstance(cluster, klass) self.assertTrue(cluster._instance is instance) self.assertEqual(cluster.cluster_id, self.CLUSTER_ID) self.assertEqual(cluster.serve_nodes, SERVE_NODES) @@ -253,7 +253,7 @@ def test_create(self): # Perform the method and check the result. result = cluster.create() - self.assertTrue(isinstance(result, Operation)) + self.assertIsInstance(result, Operation) self.assertEqual(result.name, OP_NAME) self.assertTrue(result.target is cluster) self.assertTrue(result.client is client) @@ -319,7 +319,7 @@ def test_update(self): result = cluster.update() - self.assertTrue(isinstance(result, Operation)) + self.assertIsInstance(result, Operation) self.assertEqual(result.name, OP_NAME) self.assertTrue(result.target is cluster) self.assertTrue(result.client is client) diff --git a/unit_tests/bigtable/test_column_family.py b/unit_tests/bigtable/test_column_family.py index 59b77293f1d9..57941a6031ce 100644 --- a/unit_tests/bigtable/test_column_family.py +++ b/unit_tests/bigtable/test_column_family.py @@ -31,7 +31,7 @@ def test_it(self): timedelta_val = datetime.timedelta(seconds=seconds, microseconds=microseconds) result = self._callFUT(timedelta_val) - self.assertTrue(isinstance(result, duration_pb2.Duration)) + self.assertIsInstance(result, duration_pb2.Duration) self.assertEqual(result.seconds, seconds) self.assertEqual(result.nanos, 1000 * microseconds) @@ -44,7 +44,7 @@ def test_with_negative_microseconds(self): timedelta_val = datetime.timedelta(seconds=seconds, microseconds=microseconds) result = self._callFUT(timedelta_val) - self.assertTrue(isinstance(result, duration_pb2.Duration)) + self.assertIsInstance(result, duration_pb2.Duration) self.assertEqual(result.seconds, seconds - 1) self.assertEqual(result.nanos, 10**9 + 1000 * microseconds) @@ -57,7 +57,7 @@ def test_with_negative_seconds(self): timedelta_val = datetime.timedelta(seconds=seconds, microseconds=microseconds) result = self._callFUT(timedelta_val) - self.assertTrue(isinstance(result, duration_pb2.Duration)) + self.assertIsInstance(result, duration_pb2.Duration) self.assertEqual(result.seconds, seconds + 1) self.assertEqual(result.nanos, -(10**9 - 1000 * microseconds)) @@ -79,7 +79,7 @@ def test_it(self): timedelta_val = datetime.timedelta(seconds=seconds, microseconds=microseconds) result = self._callFUT(duration_pb) - self.assertTrue(isinstance(result, datetime.timedelta)) + self.assertIsInstance(result, datetime.timedelta) self.assertEqual(result, timedelta_val) @@ -585,7 +585,7 @@ def test_max_num_versions(self): orig_rule = MaxVersionsGCRule(1) gc_rule_pb = orig_rule.to_pb() result = self._callFUT(gc_rule_pb) - self.assertTrue(isinstance(result, MaxVersionsGCRule)) + self.assertIsInstance(result, MaxVersionsGCRule) self.assertEqual(result, orig_rule) def test_max_age(self): @@ -595,7 +595,7 @@ def test_max_age(self): orig_rule = MaxAgeGCRule(datetime.timedelta(seconds=1)) gc_rule_pb = orig_rule.to_pb() result = self._callFUT(gc_rule_pb) - self.assertTrue(isinstance(result, MaxAgeGCRule)) + self.assertIsInstance(result, MaxAgeGCRule) self.assertEqual(result, orig_rule) def test_union(self): @@ -609,7 +609,7 @@ def test_union(self): orig_rule = GCRuleUnion([rule1, rule2]) gc_rule_pb = orig_rule.to_pb() result = self._callFUT(gc_rule_pb) - self.assertTrue(isinstance(result, GCRuleUnion)) + self.assertIsInstance(result, GCRuleUnion) self.assertEqual(result, orig_rule) def test_intersection(self): @@ -623,7 +623,7 @@ def test_intersection(self): orig_rule = GCRuleIntersection([rule1, rule2]) gc_rule_pb = orig_rule.to_pb() result = self._callFUT(gc_rule_pb) - self.assertTrue(isinstance(result, GCRuleIntersection)) + self.assertIsInstance(result, GCRuleIntersection) self.assertEqual(result, orig_rule) def test_unknown_field_name(self): diff --git a/unit_tests/bigtable/test_instance.py b/unit_tests/bigtable/test_instance.py index e2f92c5e58d9..d25471efb4d7 100644 --- a/unit_tests/bigtable/test_instance.py +++ b/unit_tests/bigtable/test_instance.py @@ -79,7 +79,7 @@ def test_table_factory(self): instance = self._makeOne(self.INSTANCE_ID, None, self.LOCATION_ID) table = instance.table(self.TABLE_ID) - self.assertTrue(isinstance(table, Table)) + self.assertIsInstance(table, Table) self.assertEqual(table.table_id, self.TABLE_ID) self.assertEqual(table._instance, instance) @@ -123,7 +123,7 @@ def test_from_pb_success(self): klass = self._getTargetClass() instance = klass.from_pb(instance_pb, client) - self.assertTrue(isinstance(instance, klass)) + self.assertIsInstance(instance, klass) self.assertEqual(instance._client, client) self.assertEqual(instance.instance_id, self.INSTANCE_ID) self.assertEqual(instance._cluster_location_id, @@ -261,7 +261,7 @@ def test_create(self): # Perform the method and check the result. result = instance.create() - self.assertTrue(isinstance(result, Operation)) + self.assertIsInstance(result, Operation) self.assertEqual(result.name, self.OP_NAME) self.assertTrue(result.target is instance) self.assertTrue(result.client is client) @@ -305,7 +305,7 @@ def test_create_w_explicit_serve_nodes(self): # Perform the method and check the result. result = instance.create() - self.assertTrue(isinstance(result, Operation)) + self.assertIsInstance(result, Operation) self.assertEqual(result.name, self.OP_NAME) self.assertTrue(result.target is instance) self.assertTrue(result.client is client) @@ -532,13 +532,13 @@ def test_w_defaults(self): messages_v2_pb.CreateInstanceRequest)) self.assertEqual(request_pb.instance_id, self.INSTANCE_ID) self.assertEqual(request_pb.parent, self.PARENT) - self.assertTrue(isinstance(request_pb.instance, data_v2_pb2.Instance)) + self.assertIsInstance(request_pb.instance, data_v2_pb2.Instance) self.assertEqual(request_pb.instance.name, u'') self.assertEqual(request_pb.instance.display_name, self.INSTANCE_ID) # An instance must also define a same-named cluster cluster = request_pb.clusters[self.INSTANCE_ID] - self.assertTrue(isinstance(cluster, data_v2_pb2.Cluster)) + self.assertIsInstance(cluster, data_v2_pb2.Cluster) self.assertEqual(cluster.name, self.CLUSTER_NAME) self.assertEqual(cluster.location, self.LOCATION_NAME) self.assertEqual(cluster.serve_nodes, DEFAULT_SERVE_NODES) @@ -563,11 +563,11 @@ def test_w_explicit_serve_nodes(self): self.assertEqual(request_pb.instance_id, self.INSTANCE_ID) self.assertEqual(request_pb.parent, 'projects/' + self.PROJECT) - self.assertTrue(isinstance(request_pb.instance, data_v2_pb2.Instance)) + self.assertIsInstance(request_pb.instance, data_v2_pb2.Instance) self.assertEqual(request_pb.instance.display_name, DISPLAY_NAME) # An instance must also define a same-named cluster cluster = request_pb.clusters[self.INSTANCE_ID] - self.assertTrue(isinstance(cluster, data_v2_pb2.Cluster)) + self.assertIsInstance(cluster, data_v2_pb2.Cluster) self.assertEqual(cluster.location, self.LOCATION_NAME) self.assertEqual(cluster.serve_nodes, SERVE_NODES) diff --git a/unit_tests/bigtable/test_table.py b/unit_tests/bigtable/test_table.py index 924bb5041200..58cb0a5d8044 100644 --- a/unit_tests/bigtable/test_table.py +++ b/unit_tests/bigtable/test_table.py @@ -62,7 +62,7 @@ def test_column_family_factory(self): column_family_id = 'column_family_id' column_family = table.column_family(column_family_id, gc_rule=gc_rule) - self.assertTrue(isinstance(column_family, ColumnFamily)) + self.assertIsInstance(column_family, ColumnFamily) self.assertEqual(column_family.column_family_id, column_family_id) self.assertTrue(column_family.gc_rule is gc_rule) self.assertEqual(column_family._table, table) @@ -75,7 +75,7 @@ def test_row_factory_direct(self): row_key = b'row_key' row = table.row(row_key) - self.assertTrue(isinstance(row, DirectRow)) + self.assertIsInstance(row, DirectRow) self.assertEqual(row._row_key, row_key) self.assertEqual(row._table, table) @@ -88,7 +88,7 @@ def test_row_factory_conditional(self): filter_ = object() row = table.row(row_key, filter_=filter_) - self.assertTrue(isinstance(row, ConditionalRow)) + self.assertIsInstance(row, ConditionalRow) self.assertEqual(row._row_key, row_key) self.assertEqual(row._table, table) @@ -100,7 +100,7 @@ def test_row_factory_append(self): row_key = b'row_key' row = table.row(row_key, append=True) - self.assertTrue(isinstance(row, AppendRow)) + self.assertIsInstance(row, AppendRow) self.assertEqual(row._row_key, row_key) self.assertEqual(row._table, table) diff --git a/unit_tests/datastore/test_client.py b/unit_tests/datastore/test_client.py index a4f5f57b4e69..a4c1c58f7ead 100644 --- a/unit_tests/datastore/test_client.py +++ b/unit_tests/datastore/test_client.py @@ -169,7 +169,7 @@ def fallback_mock(project): client = klass() self.assertEqual(client.project, OTHER) self.assertEqual(client.namespace, None) - self.assertTrue(isinstance(client.connection, _MockConnection)) + self.assertIsInstance(client.connection, _MockConnection) self.assertTrue(client.connection.credentials is creds) self.assertTrue(client.connection.http is None) self.assertTrue(client.current_batch is None) @@ -187,7 +187,7 @@ def test_ctor_w_explicit_inputs(self): http=http) self.assertEqual(client.project, OTHER) self.assertEqual(client.namespace, NAMESPACE) - self.assertTrue(isinstance(client.connection, _MockConnection)) + self.assertIsInstance(client.connection, _MockConnection) self.assertTrue(client.connection.credentials is creds) self.assertTrue(client.connection.http is http) self.assertTrue(client.current_batch is None) @@ -363,11 +363,11 @@ def test_get_multi_w_deferred_from_backend_but_not_passed(self): self.assertEqual(len(missing), 0) # Check the actual contents on the response. - self.assertTrue(isinstance(found[0], Entity)) + self.assertIsInstance(found[0], Entity) self.assertEqual(found[0].key.path, key1.path) self.assertEqual(found[0].key.project, key1.project) - self.assertTrue(isinstance(found[1], Entity)) + self.assertIsInstance(found[1], Entity) self.assertEqual(found[1].key.path, key2.path) self.assertEqual(found[1].key.project, key2.project) @@ -713,7 +713,7 @@ def test_key_wo_project(self): with _Monkey(MUT, Key=_Dummy): key = client.key(KIND, ID) - self.assertTrue(isinstance(key, _Dummy)) + self.assertIsInstance(key, _Dummy) self.assertEqual(key.args, (KIND, ID)) expected_kwargs = { 'project': self.PROJECT, @@ -735,7 +735,7 @@ def test_key_w_namespace(self): with _Monkey(MUT, Key=_Dummy): key = client.key(KIND, ID) - self.assertTrue(isinstance(key, _Dummy)) + self.assertIsInstance(key, _Dummy) expected_kwargs = { 'project': self.PROJECT, 'namespace': NAMESPACE, @@ -757,7 +757,7 @@ def test_key_w_namespace_collision(self): with _Monkey(MUT, Key=_Dummy): key = client.key(KIND, ID, namespace=NAMESPACE2) - self.assertTrue(isinstance(key, _Dummy)) + self.assertIsInstance(key, _Dummy) expected_kwargs = { 'project': self.PROJECT, 'namespace': NAMESPACE2, @@ -774,7 +774,7 @@ def test_batch(self): with _Monkey(MUT, Batch=_Dummy): batch = client.batch() - self.assertTrue(isinstance(batch, _Dummy)) + self.assertIsInstance(batch, _Dummy) self.assertEqual(batch.args, (client,)) self.assertEqual(batch.kwargs, {}) @@ -788,7 +788,7 @@ def test_transaction_defaults(self): with _Monkey(MUT, Transaction=_Dummy): xact = client.transaction() - self.assertTrue(isinstance(xact, _Dummy)) + self.assertIsInstance(xact, _Dummy) self.assertEqual(xact.args, (client,)) self.assertEqual(xact.kwargs, {}) @@ -820,7 +820,7 @@ def test_query_w_defaults(self): with _Monkey(MUT, Query=_Dummy): query = client.query() - self.assertTrue(isinstance(query, _Dummy)) + self.assertIsInstance(query, _Dummy) self.assertEqual(query.args, (client,)) expected_kwargs = { 'project': self.PROJECT, @@ -854,7 +854,7 @@ def test_query_explicit(self): distinct_on=DISTINCT_ON, ) - self.assertTrue(isinstance(query, _Dummy)) + self.assertIsInstance(query, _Dummy) self.assertEqual(query.args, (client,)) kwargs = { 'project': self.PROJECT, @@ -881,7 +881,7 @@ def test_query_w_namespace(self): with _Monkey(MUT, Query=_Dummy): query = client.query(kind=KIND) - self.assertTrue(isinstance(query, _Dummy)) + self.assertIsInstance(query, _Dummy) self.assertEqual(query.args, (client,)) expected_kwargs = { 'project': self.PROJECT, @@ -904,7 +904,7 @@ def test_query_w_namespace_collision(self): with _Monkey(MUT, Query=_Dummy): query = client.query(kind=KIND, namespace=NAMESPACE2) - self.assertTrue(isinstance(query, _Dummy)) + self.assertIsInstance(query, _Dummy) self.assertEqual(query.args, (client,)) expected_kwargs = { 'project': self.PROJECT, diff --git a/unit_tests/datastore/test_connection.py b/unit_tests/datastore/test_connection.py index 244975f063f0..7dcb9d22be80 100644 --- a/unit_tests/datastore/test_connection.py +++ b/unit_tests/datastore/test_connection.py @@ -49,7 +49,7 @@ def FromString(cls, pb): datastore_api = self._makeOne(conn) http = conn.http = Http({'status': '200'}, 'CONTENT') response = datastore_api._rpc(PROJECT, METHOD, ReqPB(), RspPB) - self.assertTrue(isinstance(response, RspPB)) + self.assertIsInstance(response, RspPB) self.assertEqual(response._pb, 'CONTENT') called_with = http._called_with self.assertEqual(called_with['uri'], URI) @@ -408,7 +408,7 @@ def test_http_wo_creds(self): import httplib2 conn = self._makeOne() - self.assertTrue(isinstance(conn.http, httplib2.Http)) + self.assertIsInstance(conn.http, httplib2.Http) def test_http_w_creds(self): import httplib2 @@ -427,7 +427,7 @@ def create_scoped_required(self): creds = Creds() conn = self._makeOne(creds) self.assertTrue(conn.http is authorized) - self.assertTrue(isinstance(creds._called_with, httplib2.Http)) + self.assertIsInstance(creds._called_with, httplib2.Http) def test_build_api_url_w_default_base_version(self): PROJECT = 'PROJECT' diff --git a/unit_tests/datastore/test_helpers.py b/unit_tests/datastore/test_helpers.py index 560a7a98af8f..1d3c818c726e 100644 --- a/unit_tests/datastore/test_helpers.py +++ b/unit_tests/datastore/test_helpers.py @@ -28,7 +28,7 @@ def test_it(self): name = 'foo' result = self._callFUT(entity_pb, name) - self.assertTrue(isinstance(result, entity_pb2.Value)) + self.assertIsInstance(result, entity_pb2.Value) self.assertEqual(len(entity_pb.properties), 1) self.assertEqual(entity_pb.properties[name], result) @@ -51,7 +51,7 @@ def test_it(self): val_pb2 = _new_value_pb(entity_pb, name2) result = self._callFUT(entity_pb) - self.assertTrue(isinstance(result, types.GeneratorType)) + self.assertIsInstance(result, types.GeneratorType) self.assertEqual(sorted(result), sorted([(name1, val_pb1), (name2, val_pb2)])) @@ -608,7 +608,7 @@ def test_entity(self): value_pb = _new_value_pb(entity_pb, 'foo') value_pb.string_value = 'Foo' entity = self._callFUT(pb) - self.assertTrue(isinstance(entity, Entity)) + self.assertIsInstance(entity, Entity) self.assertEqual(entity['foo'], 'Foo') def test_array(self): diff --git a/unit_tests/datastore/test_key.py b/unit_tests/datastore/test_key.py index 074323f43361..f5a70c25b77e 100644 --- a/unit_tests/datastore/test_key.py +++ b/unit_tests/datastore/test_key.py @@ -318,7 +318,7 @@ def test_to_protobuf_defaults(self): _KIND = 'KIND' key = self._makeOne(_KIND, project=self._DEFAULT_PROJECT) pb = key.to_protobuf() - self.assertTrue(isinstance(pb, entity_pb2.Key)) + self.assertIsInstance(pb, entity_pb2.Key) # Check partition ID. self.assertEqual(pb.partition_id.project_id, self._DEFAULT_PROJECT) diff --git a/unit_tests/dns/test_client.py b/unit_tests/dns/test_client.py index 2bf0c0e04428..2e1dc97d6acf 100644 --- a/unit_tests/dns/test_client.py +++ b/unit_tests/dns/test_client.py @@ -33,7 +33,7 @@ def test_ctor(self): http = object() client = self._makeOne(project=self.PROJECT, credentials=creds, http=http) - self.assertTrue(isinstance(client.connection, Connection)) + self.assertIsInstance(client.connection, Connection) self.assertTrue(client.connection.credentials is creds) self.assertTrue(client.connection.http is http) @@ -136,7 +136,7 @@ def test_list_zones_defaults(self): self.assertEqual(len(zones), len(DATA['managedZones'])) for found, expected in zip(zones, DATA['managedZones']): - self.assertTrue(isinstance(found, ManagedZone)) + self.assertIsInstance(found, ManagedZone) self.assertEqual(found.zone_id, expected['id']) self.assertEqual(found.name, expected['name']) self.assertEqual(found.dns_name, expected['dnsName']) @@ -177,7 +177,7 @@ def test_list_zones_explicit(self): self.assertEqual(len(zones), len(DATA['managedZones'])) for found, expected in zip(zones, DATA['managedZones']): - self.assertTrue(isinstance(found, ManagedZone)) + self.assertIsInstance(found, ManagedZone) self.assertEqual(found.zone_id, expected['id']) self.assertEqual(found.name, expected['name']) self.assertEqual(found.dns_name, expected['dnsName']) @@ -197,7 +197,7 @@ def test_zone_explicit(self): creds = _Credentials() client = self._makeOne(self.PROJECT, creds) zone = client.zone(self.ZONE_NAME, DNS_NAME, DESCRIPTION) - self.assertTrue(isinstance(zone, ManagedZone)) + self.assertIsInstance(zone, ManagedZone) self.assertEqual(zone.name, self.ZONE_NAME) self.assertEqual(zone.dns_name, DNS_NAME) self.assertEqual(zone.description, DESCRIPTION) @@ -209,7 +209,7 @@ def test_zone_w_dns_name_wo_description(self): creds = _Credentials() client = self._makeOne(self.PROJECT, creds) zone = client.zone(self.ZONE_NAME, DNS_NAME) - self.assertTrue(isinstance(zone, ManagedZone)) + self.assertIsInstance(zone, ManagedZone) self.assertEqual(zone.name, self.ZONE_NAME) self.assertEqual(zone.dns_name, DNS_NAME) self.assertEqual(zone.description, DNS_NAME) @@ -220,7 +220,7 @@ def test_zone_wo_dns_name(self): creds = _Credentials() client = self._makeOne(self.PROJECT, creds) zone = client.zone(self.ZONE_NAME) - self.assertTrue(isinstance(zone, ManagedZone)) + self.assertIsInstance(zone, ManagedZone) self.assertEqual(zone.name, self.ZONE_NAME) self.assertEqual(zone.dns_name, None) self.assertEqual(zone.description, None) diff --git a/unit_tests/dns/test_zone.py b/unit_tests/dns/test_zone.py index 611583955d37..2f39e519a9b9 100644 --- a/unit_tests/dns/test_zone.py +++ b/unit_tests/dns/test_zone.py @@ -192,7 +192,7 @@ def test_resource_record_set(self): client = _Client(self.PROJECT) zone = self._makeOne(self.ZONE_NAME, self.DNS_NAME, client) rrs = zone.resource_record_set(RRS_NAME, RRS_TYPE, TTL, RRDATAS) - self.assertTrue(isinstance(rrs, ResourceRecordSet)) + self.assertIsInstance(rrs, ResourceRecordSet) self.assertEqual(rrs.name, RRS_NAME) self.assertEqual(rrs.record_type, RRS_TYPE) self.assertEqual(rrs.ttl, TTL) @@ -204,7 +204,7 @@ def test_changes(self): client = _Client(self.PROJECT) zone = self._makeOne(self.ZONE_NAME, self.DNS_NAME, client) changes = zone.changes() - self.assertTrue(isinstance(changes, Changes)) + self.assertIsInstance(changes, Changes) self.assertTrue(changes.zone is zone) def test_create_w_bound_client(self): @@ -444,7 +444,7 @@ def test_list_resource_record_sets_defaults(self): self.assertEqual(len(rrsets), len(DATA['rrsets'])) for found, expected in zip(rrsets, DATA['rrsets']): - self.assertTrue(isinstance(found, ResourceRecordSet)) + self.assertIsInstance(found, ResourceRecordSet) self.assertEqual(found.name, expected['name']) self.assertEqual(found.record_type, expected['type']) self.assertEqual(found.ttl, int(expected['ttl'])) @@ -494,7 +494,7 @@ def test_list_resource_record_sets_explicit(self): self.assertEqual(len(rrsets), len(DATA['rrsets'])) for found, expected in zip(rrsets, DATA['rrsets']): - self.assertTrue(isinstance(found, ResourceRecordSet)) + self.assertIsInstance(found, ResourceRecordSet) self.assertEqual(found.name, expected['name']) self.assertEqual(found.record_type, expected['type']) self.assertEqual(found.ttl, int(expected['ttl'])) @@ -555,7 +555,7 @@ def test_list_changes_defaults(self): self.assertEqual(len(changes), len(DATA['changes'])) for found, expected in zip(changes, DATA['changes']): - self.assertTrue(isinstance(found, Changes)) + self.assertIsInstance(found, Changes) self.assertEqual(found.name, CHANGES_NAME) self.assertEqual(found.status, 'pending') self.assertEqual(found.started, self.WHEN) @@ -563,7 +563,7 @@ def test_list_changes_defaults(self): self.assertEqual(len(found.additions), len(expected['additions'])) for found_rr, expected_rr in zip(found.additions, expected['additions']): - self.assertTrue(isinstance(found_rr, ResourceRecordSet)) + self.assertIsInstance(found_rr, ResourceRecordSet) self.assertEqual(found_rr.name, expected_rr['name']) self.assertEqual(found_rr.record_type, expected_rr['type']) self.assertEqual(found_rr.ttl, int(expected_rr['ttl'])) @@ -572,7 +572,7 @@ def test_list_changes_defaults(self): self.assertEqual(len(found.deletions), len(expected['deletions'])) for found_rr, expected_rr in zip(found.deletions, expected['deletions']): - self.assertTrue(isinstance(found_rr, ResourceRecordSet)) + self.assertIsInstance(found_rr, ResourceRecordSet) self.assertEqual(found_rr.name, expected_rr['name']) self.assertEqual(found_rr.record_type, expected_rr['type']) self.assertEqual(found_rr.ttl, int(expected_rr['ttl'])) @@ -633,7 +633,7 @@ def test_list_changes_explicit(self): self.assertEqual(len(changes), len(DATA['changes'])) for found, expected in zip(changes, DATA['changes']): - self.assertTrue(isinstance(found, Changes)) + self.assertIsInstance(found, Changes) self.assertEqual(found.name, CHANGES_NAME) self.assertEqual(found.status, 'pending') self.assertEqual(found.started, self.WHEN) @@ -641,7 +641,7 @@ def test_list_changes_explicit(self): self.assertEqual(len(found.additions), len(expected['additions'])) for found_rr, expected_rr in zip(found.additions, expected['additions']): - self.assertTrue(isinstance(found_rr, ResourceRecordSet)) + self.assertIsInstance(found_rr, ResourceRecordSet) self.assertEqual(found_rr.name, expected_rr['name']) self.assertEqual(found_rr.record_type, expected_rr['type']) self.assertEqual(found_rr.ttl, int(expected_rr['ttl'])) @@ -650,7 +650,7 @@ def test_list_changes_explicit(self): self.assertEqual(len(found.deletions), len(expected['deletions'])) for found_rr, expected_rr in zip(found.deletions, expected['deletions']): - self.assertTrue(isinstance(found_rr, ResourceRecordSet)) + self.assertIsInstance(found_rr, ResourceRecordSet) self.assertEqual(found_rr.name, expected_rr['name']) self.assertEqual(found_rr.record_type, expected_rr['type']) self.assertEqual(found_rr.ttl, int(expected_rr['ttl'])) diff --git a/unit_tests/logging/test__gax.py b/unit_tests/logging/test__gax.py index f406b178d4ac..1d541a931778 100644 --- a/unit_tests/logging/test__gax.py +++ b/unit_tests/logging/test__gax.py @@ -208,7 +208,7 @@ def test_write_entries_single(self): self.assertEqual(len(entries), 1) entry = entries[0] - self.assertTrue(isinstance(entry, LogEntry)) + self.assertIsInstance(entry, LogEntry) self.assertEqual(entry.log_name, LOG_PATH) self.assertEqual(entry.resource.type, 'global') self.assertEqual(entry.labels, {}) @@ -282,7 +282,7 @@ def test_write_entries_w_extra_properties(self): self.assertEqual(len(entries), 1) entry = entries[0] - self.assertTrue(isinstance(entry, LogEntry)) + self.assertIsInstance(entry, LogEntry) self.assertEqual(entry.log_name, LOG_PATH) self.assertEqual(entry.resource.type, 'global') self.assertEqual(entry.text_payload, TEXT) @@ -360,7 +360,7 @@ def test_write_entries_multiple(self): self.assertEqual(len(entries), len(ENTRIES)) entry = entries[0] - self.assertTrue(isinstance(entry, LogEntry)) + self.assertIsInstance(entry, LogEntry) self.assertEqual(entry.log_name, '') self.assertEqual(entry.resource.type, '') self.assertEqual(entry.labels, {}) @@ -368,12 +368,12 @@ def test_write_entries_multiple(self): self.assertEqual(entry.severity, WARNING) entry = entries[1] - self.assertTrue(isinstance(entry, LogEntry)) + self.assertIsInstance(entry, LogEntry) self.assertEqual(entry.log_name, '') self.assertEqual(entry.resource.type, '') self.assertEqual(entry.labels, {}) json_struct = entry.json_payload - self.assertTrue(isinstance(json_struct, Struct)) + self.assertIsInstance(json_struct, Struct) self.assertEqual(json_struct.fields['payload'].string_value, JSON['payload']) operation = entry.operation @@ -381,12 +381,12 @@ def test_write_entries_multiple(self): self.assertEqual(operation.id, OPID) entry = entries[2] - self.assertTrue(isinstance(entry, LogEntry)) + self.assertIsInstance(entry, LogEntry) self.assertEqual(entry.log_name, '') self.assertEqual(entry.resource.type, '') self.assertEqual(entry.labels, {}) proto = entry.proto_payload - self.assertTrue(isinstance(proto, Any)) + self.assertIsInstance(proto, Any) self.assertEqual(proto.type_url, TIMESTAMP_TYPE_URL) request = entry.http_request self.assertEqual(request.request_url, URL) @@ -535,7 +535,7 @@ def test_sink_create_ok(self): parent, sink, options = ( gax_api._create_sink_called_with) self.assertEqual(parent, self.PROJECT_PATH) - self.assertTrue(isinstance(sink, LogSink)) + self.assertIsInstance(sink, LogSink) self.assertEqual(sink.name, self.SINK_NAME) self.assertEqual(sink.filter, self.FILTER) self.assertEqual(sink.destination, self.DESTINATION_URI) @@ -611,7 +611,7 @@ def test_sink_update_hit(self): sink_name, sink, options = ( gax_api._update_sink_called_with) self.assertEqual(sink_name, self.SINK_PATH) - self.assertTrue(isinstance(sink, LogSink)) + self.assertIsInstance(sink, LogSink) self.assertEqual(sink.name, self.SINK_PATH) self.assertEqual(sink.filter, self.FILTER) self.assertEqual(sink.destination, self.DESTINATION_URI) @@ -743,7 +743,7 @@ def test_metric_create_ok(self): parent, metric, options = ( gax_api._create_log_metric_called_with) self.assertEqual(parent, self.PROJECT_PATH) - self.assertTrue(isinstance(metric, LogMetric)) + self.assertIsInstance(metric, LogMetric) self.assertEqual(metric.name, self.METRIC_NAME) self.assertEqual(metric.filter, self.FILTER) self.assertEqual(metric.description, self.DESCRIPTION) @@ -819,7 +819,7 @@ def test_metric_update_hit(self): metric_name, metric, options = ( gax_api._update_log_metric_called_with) self.assertEqual(metric_name, self.METRIC_PATH) - self.assertTrue(isinstance(metric, LogMetric)) + self.assertIsInstance(metric, LogMetric) self.assertEqual(metric.name, self.METRIC_PATH) self.assertEqual(metric.filter, self.FILTER) self.assertEqual(metric.description, self.DESCRIPTION) diff --git a/unit_tests/logging/test_client.py b/unit_tests/logging/test_client.py index dfb75ef70ef7..9c71a2748198 100644 --- a/unit_tests/logging/test_client.py +++ b/unit_tests/logging/test_client.py @@ -48,7 +48,7 @@ def test_logging_api_wo_gax(self): with _Monkey(MUT, _USE_GAX=False): api = client.logging_api - self.assertTrue(isinstance(api, _LoggingAPI)) + self.assertIsInstance(api, _LoggingAPI) self.assertTrue(api._connection is conn) # API instance is cached again = client.logging_api @@ -95,7 +95,7 @@ def test_sinks_api_wo_gax(self): with _Monkey(MUT, _USE_GAX=False): api = client.sinks_api - self.assertTrue(isinstance(api, _SinksAPI)) + self.assertIsInstance(api, _SinksAPI) self.assertTrue(api._connection is conn) # API instance is cached again = client.sinks_api @@ -142,7 +142,7 @@ def test_metrics_api_wo_gax(self): with _Monkey(MUT, _USE_GAX=False): api = client.metrics_api - self.assertTrue(isinstance(api, _MetricsAPI)) + self.assertIsInstance(api, _MetricsAPI) self.assertTrue(api._connection is conn) # API instance is cached again = client.metrics_api @@ -184,7 +184,7 @@ def test_logger(self): creds = _Credentials() client = self._makeOne(project=self.PROJECT, credentials=creds) logger = client.logger(self.LOGGER_NAME) - self.assertTrue(isinstance(logger, Logger)) + self.assertIsInstance(logger, Logger) self.assertEqual(logger.name, self.LOGGER_NAME) self.assertTrue(logger.client is client) self.assertEqual(logger.project, self.PROJECT) @@ -220,7 +220,7 @@ def test_list_entries_defaults(self): self.assertEqual(len(entries), 1) entry = entries[0] - self.assertTrue(isinstance(entry, TextEntry)) + self.assertIsInstance(entry, TextEntry) self.assertEqual(entry.insert_id, IID) self.assertEqual(entry.payload, TEXT) logger = entry.logger @@ -276,17 +276,17 @@ def test_list_entries_explicit(self): self.assertEqual(len(entries), 2) entry = entries[0] - self.assertTrue(isinstance(entry, StructEntry)) + self.assertIsInstance(entry, StructEntry) self.assertEqual(entry.insert_id, IID1) self.assertEqual(entry.payload, PAYLOAD) logger = entry.logger - self.assertTrue(isinstance(logger, Logger)) + self.assertIsInstance(logger, Logger) self.assertEqual(logger.name, self.LOGGER_NAME) self.assertTrue(logger.client is client) self.assertEqual(logger.project, self.PROJECT) entry = entries[1] - self.assertTrue(isinstance(entry, ProtobufEntry)) + self.assertIsInstance(entry, ProtobufEntry) self.assertEqual(entry.insert_id, IID2) self.assertEqual(entry.payload, PROTO_PAYLOAD) logger = entry.logger @@ -306,7 +306,7 @@ def test_sink_defaults(self): creds = _Credentials() client = self._makeOne(project=self.PROJECT, credentials=creds) sink = client.sink(self.SINK_NAME) - self.assertTrue(isinstance(sink, Sink)) + self.assertIsInstance(sink, Sink) self.assertEqual(sink.name, self.SINK_NAME) self.assertEqual(sink.filter_, None) self.assertEqual(sink.destination, None) @@ -318,7 +318,7 @@ def test_sink_explicit(self): creds = _Credentials() client = self._makeOne(project=self.PROJECT, credentials=creds) sink = client.sink(self.SINK_NAME, self.FILTER, self.DESTINATION_URI) - self.assertTrue(isinstance(sink, Sink)) + self.assertIsInstance(sink, Sink) self.assertEqual(sink.name, self.SINK_NAME) self.assertEqual(sink.filter_, self.FILTER) self.assertEqual(sink.destination, self.DESTINATION_URI) @@ -344,7 +344,7 @@ def test_list_sinks_no_paging(self): self.assertEqual(len(sinks), 1) sink = sinks[0] - self.assertTrue(isinstance(sink, Sink)) + self.assertIsInstance(sink, Sink) self.assertEqual(sink.name, SINK_NAME) self.assertEqual(sink.filter_, FILTER) self.assertEqual(sink.destination, self.DESTINATION_URI) @@ -373,7 +373,7 @@ def test_list_sinks_with_paging(self): self.assertEqual(len(sinks), 1) sink = sinks[0] - self.assertTrue(isinstance(sink, Sink)) + self.assertIsInstance(sink, Sink) self.assertEqual(sink.name, SINK_NAME) self.assertEqual(sink.filter_, FILTER) self.assertEqual(sink.destination, self.DESTINATION_URI) @@ -387,7 +387,7 @@ def test_metric_defaults(self): client_obj = self._makeOne(project=self.PROJECT, credentials=creds) metric = client_obj.metric(self.METRIC_NAME) - self.assertTrue(isinstance(metric, Metric)) + self.assertIsInstance(metric, Metric) self.assertEqual(metric.name, self.METRIC_NAME) self.assertEqual(metric.filter_, None) self.assertEqual(metric.description, '') @@ -401,7 +401,7 @@ def test_metric_explicit(self): client_obj = self._makeOne(project=self.PROJECT, credentials=creds) metric = client_obj.metric(self.METRIC_NAME, self.FILTER, description=self.DESCRIPTION) - self.assertTrue(isinstance(metric, Metric)) + self.assertIsInstance(metric, Metric) self.assertEqual(metric.name, self.METRIC_NAME) self.assertEqual(metric.filter_, self.FILTER) self.assertEqual(metric.description, self.DESCRIPTION) @@ -425,7 +425,7 @@ def test_list_metrics_no_paging(self): self.assertEqual(len(metrics), 1) metric = metrics[0] - self.assertTrue(isinstance(metric, Metric)) + self.assertIsInstance(metric, Metric) self.assertEqual(metric.name, self.METRIC_NAME) self.assertEqual(metric.filter_, self.FILTER) self.assertEqual(metric.description, self.DESCRIPTION) @@ -452,7 +452,7 @@ def test_list_metrics_with_paging(self): # Test values are correct. self.assertEqual(len(metrics), 1) metric = metrics[0] - self.assertTrue(isinstance(metric, Metric)) + self.assertIsInstance(metric, Metric) self.assertEqual(metric.name, self.METRIC_NAME) self.assertEqual(metric.filter_, self.FILTER) self.assertEqual(metric.description, self.DESCRIPTION) diff --git a/unit_tests/logging/test_entries.py b/unit_tests/logging/test_entries.py index 350a92f2ab7b..707bab1a0b70 100644 --- a/unit_tests/logging/test_entries.py +++ b/unit_tests/logging/test_entries.py @@ -112,7 +112,7 @@ def test_from_api_repr_missing_data_no_loggers(self): self.assertTrue(entry.severity is None) self.assertTrue(entry.http_request is None) logger = entry.logger - self.assertTrue(isinstance(logger, _Logger)) + self.assertIsInstance(logger, _Logger) self.assertTrue(logger.client is client) self.assertEqual(logger.name, self.LOGGER_NAME) @@ -155,7 +155,7 @@ def test_from_api_repr_w_loggers_no_logger_match(self): self.assertEqual(entry.http_request['requestUrl'], URI) self.assertEqual(entry.http_request['status'], STATUS) logger = entry.logger - self.assertTrue(isinstance(logger, _Logger)) + self.assertIsInstance(logger, _Logger) self.assertTrue(logger.client is client) self.assertEqual(logger.name, self.LOGGER_NAME) self.assertEqual(loggers, {LOG_NAME: logger}) diff --git a/unit_tests/logging/test_logger.py b/unit_tests/logging/test_logger.py index 1f882d85add8..cc58cb7bb171 100644 --- a/unit_tests/logging/test_logger.py +++ b/unit_tests/logging/test_logger.py @@ -60,7 +60,7 @@ def test_batch_w_bound_client(self): client = _Client(self.PROJECT, conn) logger = self._makeOne(self.LOGGER_NAME, client=client) batch = logger.batch() - self.assertTrue(isinstance(batch, Batch)) + self.assertIsInstance(batch, Batch) self.assertTrue(batch.logger is logger) self.assertTrue(batch.client is client) @@ -72,7 +72,7 @@ def test_batch_w_alternate_client(self): client2 = _Client(self.PROJECT, conn2) logger = self._makeOne(self.LOGGER_NAME, client=client1) batch = logger.batch(client2) - self.assertTrue(isinstance(batch, Batch)) + self.assertIsInstance(batch, Batch) self.assertTrue(batch.logger is logger) self.assertTrue(batch.client is client2) diff --git a/unit_tests/pubsub/test_subscription.py b/unit_tests/pubsub/test_subscription.py index 3c5896056574..f5708b80350b 100644 --- a/unit_tests/pubsub/test_subscription.py +++ b/unit_tests/pubsub/test_subscription.py @@ -149,7 +149,7 @@ def test_autoack_defaults(self): topic = _Topic(self.TOPIC_NAME, client=client) subscription = self._makeOne(self.SUB_NAME, topic) auto_ack = subscription.auto_ack() - self.assertTrue(isinstance(auto_ack, AutoAck)) + self.assertIsInstance(auto_ack, AutoAck) self.assertTrue(auto_ack._subscription is subscription) self.assertEqual(auto_ack._return_immediately, False) self.assertEqual(auto_ack._max_messages, 1) @@ -162,7 +162,7 @@ def test_autoack_explicit(self): topic = _Topic(self.TOPIC_NAME, client=client1) subscription = self._makeOne(self.SUB_NAME, topic) auto_ack = subscription.auto_ack(True, 10, client2) - self.assertTrue(isinstance(auto_ack, AutoAck)) + self.assertIsInstance(auto_ack, AutoAck) self.assertTrue(auto_ack._subscription is subscription) self.assertEqual(auto_ack._return_immediately, True) self.assertEqual(auto_ack._max_messages, 10) diff --git a/unit_tests/resource_manager/test_client.py b/unit_tests/resource_manager/test_client.py index 0d9fe8c793bd..153e762168bb 100644 --- a/unit_tests/resource_manager/test_client.py +++ b/unit_tests/resource_manager/test_client.py @@ -60,7 +60,7 @@ def test_get_items_from_response_non_empty(self): projects = list(iterator.get_items_from_response(RESPONSE)) project, = projects - self.assertTrue(isinstance(project, Project)) + self.assertIsInstance(project, Project) self.assertEqual(project.project_id, PROJECT_ID) self.assertEqual(project._client, client) self.assertEqual(project.name, PROJECT_NAME) @@ -84,7 +84,7 @@ def test_constructor(self): http = object() credentials = _Credentials() client = self._makeOne(credentials=credentials, http=http) - self.assertTrue(isinstance(client.connection, Connection)) + self.assertIsInstance(client.connection, Connection) self.assertEqual(client.connection._credentials, credentials) self.assertEqual(client.connection._http, http) @@ -98,7 +98,7 @@ def test_new_project_factory(self): labels = object() project = client.new_project(project_id, name=name, labels=labels) - self.assertTrue(isinstance(project, Project)) + self.assertIsInstance(project, Project) self.assertEqual(project._client, client) self.assertEqual(project.project_id, project_id) self.assertEqual(project.name, name) @@ -125,7 +125,7 @@ def test_fetch_project(self): client.connection = _Connection(project_resource) project = client.fetch_project(project_id) - self.assertTrue(isinstance(project, Project)) + self.assertIsInstance(project, Project) self.assertEqual(project._client, client) self.assertEqual(project.project_id, project_id) self.assertEqual(project.name, project_name) diff --git a/unit_tests/storage/test_batch.py b/unit_tests/storage/test_batch.py index 6c0130515bd0..5ac310284773 100644 --- a/unit_tests/storage/test_batch.py +++ b/unit_tests/storage/test_batch.py @@ -110,7 +110,7 @@ def test__make_request_GET_normal(self): response, content = batch._make_request('GET', URL, target_object=target) self.assertEqual(response.status, 204) - self.assertTrue(isinstance(content, _FutureDict)) + self.assertIsInstance(content, _FutureDict) self.assertTrue(target._properties is content) self.assertEqual(http._requests, []) EXPECTED_HEADERS = [ @@ -135,7 +135,7 @@ def test__make_request_POST_normal(self): response, content = batch._make_request('POST', URL, data={'foo': 1}, target_object=target) self.assertEqual(response.status, 204) - self.assertTrue(isinstance(content, _FutureDict)) + self.assertIsInstance(content, _FutureDict) self.assertTrue(target._properties is content) self.assertEqual(http._requests, []) EXPECTED_HEADERS = [ @@ -160,7 +160,7 @@ def test__make_request_PATCH_normal(self): response, content = batch._make_request('PATCH', URL, data={'foo': 1}, target_object=target) self.assertEqual(response.status, 204) - self.assertTrue(isinstance(content, _FutureDict)) + self.assertIsInstance(content, _FutureDict) self.assertTrue(target._properties is content) self.assertEqual(http._requests, []) EXPECTED_HEADERS = [ @@ -185,7 +185,7 @@ def test__make_request_DELETE_normal(self): response, content = batch._make_request('DELETE', URL, target_object=target) self.assertEqual(response.status, 204) - self.assertTrue(isinstance(content, _FutureDict)) + self.assertIsInstance(content, _FutureDict) self.assertTrue(target._properties is content) self.assertEqual(http._requests, []) EXPECTED_HEADERS = [ @@ -439,9 +439,9 @@ def test_as_context_mgr_w_error(self): self.assertEqual(batch._target_objects, [target1, target2, target3]) # Since the context manager fails, finish will not get called and # the _properties will still be futures. - self.assertTrue(isinstance(target1._properties, _FutureDict)) - self.assertTrue(isinstance(target2._properties, _FutureDict)) - self.assertTrue(isinstance(target3._properties, _FutureDict)) + self.assertIsInstance(target1._properties, _FutureDict) + self.assertIsInstance(target2._properties, _FutureDict) + self.assertIsInstance(target3._properties, _FutureDict) class Test__unpack_batch_response(unittest.TestCase): diff --git a/unit_tests/storage/test_blob.py b/unit_tests/storage/test_blob.py index cc28ca3399ba..15248a4d0e24 100644 --- a/unit_tests/storage/test_blob.py +++ b/unit_tests/storage/test_blob.py @@ -75,7 +75,7 @@ def test_acl_property(self): FAKE_BUCKET = _Bucket() blob = self._makeOne(None, bucket=FAKE_BUCKET) acl = blob.acl - self.assertTrue(isinstance(acl, ObjectACL)) + self.assertIsInstance(acl, ObjectACL) self.assertTrue(acl is blob._acl) def test_path_no_bucket(self): diff --git a/unit_tests/storage/test_bucket.py b/unit_tests/storage/test_bucket.py index 68325a4392d4..281fbe4308b6 100644 --- a/unit_tests/storage/test_bucket.py +++ b/unit_tests/storage/test_bucket.py @@ -56,7 +56,7 @@ def test_get_items_from_response_non_empty(self): blobs = list(iterator.get_items_from_response(response)) self.assertEqual(len(blobs), 1) blob = blobs[0] - self.assertTrue(isinstance(blob, Blob)) + self.assertIsInstance(blob, Blob) self.assertEqual(blob.name, BLOB_NAME) self.assertEqual(iterator.prefixes, set(['foo'])) @@ -76,7 +76,7 @@ def test_get_items_from_response_cumulative_prefixes(self): blobs = list(iterator.get_items_from_response(response1)) self.assertEqual(len(blobs), 1) blob = blobs[0] - self.assertTrue(isinstance(blob, Blob)) + self.assertIsInstance(blob, Blob) self.assertEqual(blob.name, BLOB_NAME) self.assertEqual(iterator.prefixes, set(['foo'])) # Parse second response. @@ -116,7 +116,7 @@ def test_blob(self): bucket = self._makeOne(name=BUCKET_NAME) blob = bucket.blob(BLOB_NAME, chunk_size=CHUNK_SIZE) - self.assertTrue(isinstance(blob, Blob)) + self.assertIsInstance(blob, Blob) self.assertTrue(blob.bucket is bucket) self.assertTrue(blob.client is bucket.client) self.assertEqual(blob.name, BLOB_NAME) @@ -233,14 +233,14 @@ def test_acl_property(self): from google.cloud.storage.acl import BucketACL bucket = self._makeOne() acl = bucket.acl - self.assertTrue(isinstance(acl, BucketACL)) + self.assertIsInstance(acl, BucketACL) self.assertTrue(acl is bucket._acl) def test_default_object_acl_property(self): from google.cloud.storage.acl import DefaultObjectACL bucket = self._makeOne() acl = bucket.default_object_acl - self.assertTrue(isinstance(acl, DefaultObjectACL)) + self.assertIsInstance(acl, DefaultObjectACL) self.assertTrue(acl is bucket._default_object_acl) def test_path_no_name(self): diff --git a/unit_tests/storage/test_client.py b/unit_tests/storage/test_client.py index 26e2f1dd8916..a7149fb091a8 100644 --- a/unit_tests/storage/test_client.py +++ b/unit_tests/storage/test_client.py @@ -32,7 +32,7 @@ def test_ctor_connection_type(self): client = self._makeOne(project=PROJECT, credentials=CREDENTIALS) self.assertEqual(client.project, PROJECT) - self.assertTrue(isinstance(client.connection, Connection)) + self.assertIsInstance(client.connection, Connection) self.assertTrue(client.connection.credentials is CREDENTIALS) self.assertTrue(client.current_batch is None) self.assertEqual(list(client._batch_stack), []) @@ -99,7 +99,7 @@ def test_bucket(self): client = self._makeOne(project=PROJECT, credentials=CREDENTIALS) bucket = client.bucket(BUCKET_NAME) - self.assertTrue(isinstance(bucket, Bucket)) + self.assertIsInstance(bucket, Bucket) self.assertTrue(bucket.client is client) self.assertEqual(bucket.name, BUCKET_NAME) @@ -111,7 +111,7 @@ def test_batch(self): client = self._makeOne(project=PROJECT, credentials=CREDENTIALS) batch = client.batch() - self.assertTrue(isinstance(batch, Batch)) + self.assertIsInstance(batch, Batch) self.assertTrue(batch._client is client) def test_get_bucket_miss(self): @@ -158,7 +158,7 @@ def test_get_bucket_hit(self): ) bucket = client.get_bucket(BLOB_NAME) - self.assertTrue(isinstance(bucket, Bucket)) + self.assertIsInstance(bucket, Bucket) self.assertEqual(bucket.name, BLOB_NAME) self.assertEqual(http._called_with['method'], 'GET') self.assertEqual(http._called_with['uri'], URI) @@ -206,7 +206,7 @@ def test_lookup_bucket_hit(self): ) bucket = client.lookup_bucket(BLOB_NAME) - self.assertTrue(isinstance(bucket, Bucket)) + self.assertIsInstance(bucket, Bucket) self.assertEqual(bucket.name, BLOB_NAME) self.assertEqual(http._called_with['method'], 'GET') self.assertEqual(http._called_with['uri'], URI) @@ -254,7 +254,7 @@ def test_create_bucket_success(self): ) bucket = client.create_bucket(BLOB_NAME) - self.assertTrue(isinstance(bucket, Bucket)) + self.assertIsInstance(bucket, Bucket) self.assertEqual(bucket.name, BLOB_NAME) self.assertEqual(http._called_with['method'], 'POST') self.assertEqual(http._called_with['uri'], URI) @@ -404,7 +404,7 @@ def test_get_items_from_response_non_empty(self): buckets = list(iterator.get_items_from_response(response)) self.assertEqual(len(buckets), 1) bucket = buckets[0] - self.assertTrue(isinstance(bucket, Bucket)) + self.assertIsInstance(bucket, Bucket) self.assertEqual(bucket.name, BLOB_NAME) diff --git a/unit_tests/streaming/test_exceptions.py b/unit_tests/streaming/test_exceptions.py index d2a69834f1b7..a0e17447042f 100644 --- a/unit_tests/streaming/test_exceptions.py +++ b/unit_tests/streaming/test_exceptions.py @@ -36,7 +36,7 @@ class _Response(object): klass = self._getTargetClass() exception = klass.from_response(_Response()) - self.assertTrue(isinstance(exception, klass)) + self.assertIsInstance(exception, klass) self.assertEqual(exception.response, RESPONSE) self.assertEqual(exception.content, CONTENT) self.assertEqual(exception.url, URL) @@ -80,7 +80,7 @@ class _Response(object): klass = self._getTargetClass() exception = klass.from_response(_Response()) - self.assertTrue(isinstance(exception, klass)) + self.assertIsInstance(exception, klass) self.assertEqual(exception.response, RESPONSE) self.assertEqual(exception.content, CONTENT) self.assertEqual(exception.url, URL) diff --git a/unit_tests/streaming/test_http_wrapper.py b/unit_tests/streaming/test_http_wrapper.py index 61f95112100b..4c664a3d7122 100644 --- a/unit_tests/streaming/test_http_wrapper.py +++ b/unit_tests/streaming/test_http_wrapper.py @@ -282,7 +282,7 @@ def test_defaults_wo_connections(self): _check_response=_checked.append): response = self._callFUT(_http, _request) - self.assertTrue(isinstance(response, MUT.Response)) + self.assertIsInstance(response, MUT.Response) self.assertEqual(response.info, INFO) self.assertEqual(response.content, CONTENT) self.assertEqual(response.request_url, _request.url) @@ -304,7 +304,7 @@ def test_w_http_connections_miss(self): _check_response=_checked.append): response = self._callFUT(_http, _request) - self.assertTrue(isinstance(response, MUT.Response)) + self.assertIsInstance(response, MUT.Response) self.assertEqual(response.info, INFO) self.assertEqual(response.content, CONTENT) self.assertEqual(response.request_url, _request.url) @@ -326,7 +326,7 @@ def test_w_http_connections_hit(self): _check_response=_checked.append): response = self._callFUT(_http, _request) - self.assertTrue(isinstance(response, MUT.Response)) + self.assertIsInstance(response, MUT.Response) self.assertEqual(response.info, INFO) self.assertEqual(response.content, CONTENT) self.assertEqual(response.request_url, _request.url) diff --git a/unit_tests/streaming/test_transfer.py b/unit_tests/streaming/test_transfer.py index fc0d040efe4c..cff2c1f66b7f 100644 --- a/unit_tests/streaming/test_transfer.py +++ b/unit_tests/streaming/test_transfer.py @@ -85,7 +85,7 @@ def test__initialize_not_already_initialized_wo_http(self): xfer = self._makeOne(stream) xfer._initialize(None, self.URL) self.assertTrue(xfer.initialized) - self.assertTrue(isinstance(xfer.http, Http)) + self.assertIsInstance(xfer.http, Http) self.assertTrue(xfer.url is self.URL) def test__initialize_w_existing_http(self): @@ -1352,7 +1352,7 @@ def test_initialize_upload_w_granularity_w_auto_transfer_w_OK(self): self.assertEqual(len(requester._requested), 2) self.assertTrue(requester._requested[0][0] is request) chunk_request = requester._requested[1][0] - self.assertTrue(isinstance(chunk_request, _Request)) + self.assertIsInstance(chunk_request, _Request) self.assertEqual(chunk_request.url, self.UPLOAD_URL) self.assertEqual(chunk_request.http_method, 'PUT') self.assertEqual(chunk_request.body, CONTENT) @@ -1660,7 +1660,7 @@ def test__send_media_body_start_lt_total_size(self): self.assertEqual(request.url, self.UPLOAD_URL) self.assertEqual(request.http_method, 'PUT') body_stream = request.body - self.assertTrue(isinstance(body_stream, StreamSlice)) + self.assertIsInstance(body_stream, StreamSlice) self.assertTrue(body_stream._stream is stream) self.assertEqual(len(body_stream), SIZE) self.assertEqual(request.headers, @@ -1687,7 +1687,7 @@ def test__send_media_body_start_eq_total_size(self): self.assertEqual(request.url, self.UPLOAD_URL) self.assertEqual(request.http_method, 'PUT') body_stream = request.body - self.assertTrue(isinstance(body_stream, StreamSlice)) + self.assertIsInstance(body_stream, StreamSlice) self.assertTrue(body_stream._stream is stream) self.assertEqual(len(body_stream), 0) self.assertEqual(request.headers, @@ -1775,7 +1775,7 @@ def test__send_chunk_w_total_size_stream_not_exhausted(self): self.assertEqual(request.url, self.UPLOAD_URL) self.assertEqual(request.http_method, 'PUT') body_stream = request.body - self.assertTrue(isinstance(body_stream, StreamSlice)) + self.assertIsInstance(body_stream, StreamSlice) self.assertTrue(body_stream._stream is stream) self.assertEqual(len(body_stream), CHUNK_SIZE) expected_headers = { @@ -1806,7 +1806,7 @@ def test__send_chunk_w_total_size_stream_exhausted(self): self.assertEqual(request.url, self.UPLOAD_URL) self.assertEqual(request.http_method, 'PUT') body_stream = request.body - self.assertTrue(isinstance(body_stream, StreamSlice)) + self.assertIsInstance(body_stream, StreamSlice) self.assertTrue(body_stream._stream is stream) self.assertEqual(len(body_stream), 0) self.assertEqual(request.headers, diff --git a/unit_tests/test__helpers.py b/unit_tests/test__helpers.py index ccebcc208a95..923fd7e6df4e 100644 --- a/unit_tests/test__helpers.py +++ b/unit_tests/test__helpers.py @@ -59,7 +59,7 @@ def test_module_property(self): try: import pytz except ImportError: - self.assertTrue(isinstance(MUT.UTC, klass)) + self.assertIsInstance(MUT.UTC, klass) else: self.assertIs(MUT.UTC, pytz.UTC) # pragma: NO COVER @@ -479,7 +479,7 @@ def test_w_utc_datetime(self): NOW_MICROS = _microseconds_from_datetime(NOW) MILLIS = NOW_MICROS // 1000 result = self._callFUT(NOW) - self.assertTrue(isinstance(result, six.integer_types)) + self.assertIsInstance(result, six.integer_types) self.assertEqual(result, MILLIS) def test_w_non_utc_datetime(self): @@ -497,7 +497,7 @@ class CET(_UTC): NOW_MICROS = _microseconds_from_datetime(NOW) MILLIS = NOW_MICROS // 1000 result = self._callFUT(NOW) - self.assertTrue(isinstance(result, six.integer_types)) + self.assertIsInstance(result, six.integer_types) self.assertEqual(result, MILLIS) def test_w_naive_datetime(self): @@ -511,7 +511,7 @@ def test_w_naive_datetime(self): UTC_NOW_MICROS = _microseconds_from_datetime(UTC_NOW) MILLIS = UTC_NOW_MICROS // 1000 result = self._callFUT(NOW) - self.assertTrue(isinstance(result, six.integer_types)) + self.assertIsInstance(result, six.integer_types) self.assertEqual(result, MILLIS) diff --git a/unit_tests/test_client.py b/unit_tests/test_client.py index c1a178b5a84a..b748314a90ca 100644 --- a/unit_tests/test_client.py +++ b/unit_tests/test_client.py @@ -58,7 +58,7 @@ def mock_get_credentials(): with _Monkey(client, get_credentials=mock_get_credentials): client_obj = self._makeOne() - self.assertTrue(isinstance(client_obj.connection, _MockConnection)) + self.assertIsInstance(client_obj.connection, _MockConnection) self.assertTrue(client_obj.connection.credentials is CREDENTIALS) self.assertEqual(FUNC_CALLS, ['get_credentials']) @@ -67,7 +67,7 @@ def test_ctor_explicit(self): HTTP = object() client_obj = self._makeOne(credentials=CREDENTIALS, http=HTTP) - self.assertTrue(isinstance(client_obj.connection, _MockConnection)) + self.assertIsInstance(client_obj.connection, _MockConnection) self.assertTrue(client_obj.connection.credentials is CREDENTIALS) self.assertTrue(client_obj.connection.http is HTTP) @@ -154,7 +154,7 @@ def mock_get_credentials(): client_obj = self._makeOne() self.assertEqual(client_obj.project, PROJECT) - self.assertTrue(isinstance(client_obj.connection, _MockConnection)) + self.assertIsInstance(client_obj.connection, _MockConnection) self.assertTrue(client_obj.connection.credentials is CREDENTIALS) self.assertEqual( FUNC_CALLS, @@ -194,7 +194,7 @@ def _explicit_ctor_helper(self, project): self.assertEqual(client_obj.project, project.decode('utf-8')) else: self.assertEqual(client_obj.project, project) - self.assertTrue(isinstance(client_obj.connection, _MockConnection)) + self.assertIsInstance(client_obj.connection, _MockConnection) self.assertTrue(client_obj.connection.credentials is CREDENTIALS) self.assertTrue(client_obj.connection.http is HTTP) diff --git a/unit_tests/test_connection.py b/unit_tests/test_connection.py index 6abc6ecb6a3c..148620af018b 100644 --- a/unit_tests/test_connection.py +++ b/unit_tests/test_connection.py @@ -56,7 +56,7 @@ def test_http_w_existing(self): def test_http_wo_creds(self): import httplib2 conn = self._makeOne() - self.assertTrue(isinstance(conn.http, httplib2.Http)) + self.assertIsInstance(conn.http, httplib2.Http) def test_http_w_creds(self): import httplib2 @@ -65,7 +65,7 @@ def test_http_w_creds(self): credentials = _Credentials(authorized) conn = self._makeOne(credentials) self.assertTrue(conn.http is authorized) - self.assertTrue(isinstance(credentials._called_with, httplib2.Http)) + self.assertIsInstance(credentials._called_with, httplib2.Http) def test_user_agent_format(self): from pkg_resources import get_distribution @@ -114,7 +114,7 @@ def test_http_w_existing(self): def test_http_wo_creds(self): import httplib2 conn = self._makeOne() - self.assertTrue(isinstance(conn.http, httplib2.Http)) + self.assertIsInstance(conn.http, httplib2.Http) def test_http_w_creds(self): import httplib2 @@ -123,7 +123,7 @@ def test_http_w_creds(self): credentials = _Credentials(authorized) conn = self._makeOne(credentials) self.assertTrue(conn.http is authorized) - self.assertTrue(isinstance(credentials._called_with, httplib2.Http)) + self.assertIsInstance(credentials._called_with, httplib2.Http) def test_build_api_url_no_extra_query_params(self): conn = self._makeMockOne() diff --git a/unit_tests/test_credentials.py b/unit_tests/test_credentials.py index c8e71dd923aa..5f1f2ea03d7d 100644 --- a/unit_tests/test_credentials.py +++ b/unit_tests/test_credentials.py @@ -28,7 +28,7 @@ def test_it(self): client = _Client() with _Monkey(MUT, client=client): found = self._callFUT() - self.assertTrue(isinstance(found, _Credentials)) + self.assertIsInstance(found, _Credentials) self.assertTrue(found is client._signed) self.assertTrue(client._get_app_default_called) diff --git a/unit_tests/test_exceptions.py b/unit_tests/test_exceptions.py index 3b99b30c1cdf..506d2f772aa1 100644 --- a/unit_tests/test_exceptions.py +++ b/unit_tests/test_exceptions.py @@ -58,7 +58,7 @@ def test_hit_w_content_as_str(self): response = _Response(404) content = b'{"error": {"message": "Not Found"}}' exception = self._callFUT(response, content) - self.assertTrue(isinstance(exception, NotFound)) + self.assertIsInstance(exception, NotFound) self.assertEqual(exception.message, 'Not Found') self.assertEqual(list(exception.errors), []) @@ -74,7 +74,7 @@ def test_miss_w_content_as_dict(self): response = _Response(600) content = {"error": {"message": "Unknown Error", "errors": [ERROR]}} exception = self._callFUT(response, content) - self.assertTrue(isinstance(exception, GoogleCloudError)) + self.assertIsInstance(exception, GoogleCloudError) self.assertEqual(exception.message, 'Unknown Error') self.assertEqual(list(exception.errors), [ERROR]) @@ -83,7 +83,7 @@ def test_html_when_json_expected(self): response = _Response(NotFound.code) content = '404 Not Found' exception = self._callFUT(response, content, use_json=True) - self.assertTrue(isinstance(exception, NotFound)) + self.assertIsInstance(exception, NotFound) self.assertEqual(exception.message, content) self.assertEqual(list(exception.errors), []) diff --git a/unit_tests/test_operation.py b/unit_tests/test_operation.py index da0aa7af11f0..ce23e6e5cd09 100644 --- a/unit_tests/test_operation.py +++ b/unit_tests/test_operation.py @@ -175,7 +175,7 @@ def test_from_pb_w_metadata_and_kwargs(self): self.assertEqual(operation.name, self.OPERATION_NAME) self.assertTrue(operation.client is client) pb_metadata = operation.pb_metadata - self.assertTrue(isinstance(pb_metadata, Struct)) + self.assertIsInstance(pb_metadata, Struct) self.assertEqual(list(pb_metadata.fields), ['foo']) self.assertEqual(pb_metadata.fields['foo'].string_value, 'Bar') self.assertEqual(operation.metadata, {'baz': 'qux'}) @@ -208,7 +208,7 @@ def test_poll_false(self): self.assertFalse(operation.poll()) request_pb = stub._get_operation_requested - self.assertTrue(isinstance(request_pb, GetOperationRequest)) + self.assertIsInstance(request_pb, GetOperationRequest) self.assertEqual(request_pb.name, self.OPERATION_NAME) def test_poll_true(self): @@ -222,7 +222,7 @@ def test_poll_true(self): self.assertTrue(operation.poll()) request_pb = stub._get_operation_requested - self.assertTrue(isinstance(request_pb, GetOperationRequest)) + self.assertIsInstance(request_pb, GetOperationRequest) self.assertEqual(request_pb.name, self.OPERATION_NAME) diff --git a/unit_tests/translate/test_client.py b/unit_tests/translate/test_client.py index 233f01aa602d..684d23f5ba2e 100644 --- a/unit_tests/translate/test_client.py +++ b/unit_tests/translate/test_client.py @@ -32,7 +32,7 @@ def test_ctor(self): http = object() client = self._makeOne(self.KEY, http=http) - self.assertTrue(isinstance(client.connection, Connection)) + self.assertIsInstance(client.connection, Connection) self.assertIsNone(client.connection.credentials) self.assertTrue(client.connection.http is http) self.assertEqual(client.target_language, ENGLISH_ISO_639) @@ -43,7 +43,7 @@ def test_ctor_non_default(self): http = object() target = 'es' client = self._makeOne(self.KEY, http=http, target_language=target) - self.assertTrue(isinstance(client.connection, Connection)) + self.assertIsInstance(client.connection, Connection) self.assertIsNone(client.connection.credentials) self.assertTrue(client.connection.http is http) self.assertEqual(client.target_language, target) diff --git a/unit_tests/vision/test_client.py b/unit_tests/vision/test_client.py index fe27ded31662..565e5e607317 100644 --- a/unit_tests/vision/test_client.py +++ b/unit_tests/vision/test_client.py @@ -78,7 +78,7 @@ def test_image_with_client(self): client = self._makeOne(project=self.PROJECT, credentials=credentials) image = client.image(source_uri=_IMAGE_SOURCE) - self.assertTrue(isinstance(image, Image)) + self.assertIsInstance(image, Image) def test_face_detection_from_source(self): from google.cloud.vision.face import Face @@ -91,7 +91,7 @@ def test_face_detection_from_source(self): image = client.image(source_uri=_IMAGE_SOURCE) faces = image.detect_faces(limit=3) self.assertEqual(5, len(faces)) - self.assertTrue(isinstance(faces[0], Face)) + self.assertIsInstance(faces[0], Face) image_request = client.connection._requested[0]['data']['requests'][0] self.assertEqual(_IMAGE_SOURCE, image_request['image']['source']['gcs_image_uri']) @@ -108,7 +108,7 @@ def test_face_detection_from_content(self): image = client.image(content=_IMAGE_CONTENT) faces = image.detect_faces(limit=5) self.assertEqual(5, len(faces)) - self.assertTrue(isinstance(faces[0], Face)) + self.assertIsInstance(faces[0], Face) image_request = client.connection._requested[0]['data']['requests'][0] self.assertEqual(self.B64_IMAGE_CONTENT, image_request['image']['content']) @@ -125,7 +125,7 @@ def test_label_detection_from_source(self): image = client.image(source_uri=_IMAGE_SOURCE) labels = image.detect_labels(limit=3) self.assertEqual(3, len(labels)) - self.assertTrue(isinstance(labels[0], EntityAnnotation)) + self.assertIsInstance(labels[0], EntityAnnotation) image_request = client.connection._requested[0]['data']['requests'][0] self.assertEqual(_IMAGE_SOURCE, image_request['image']['source']['gcs_image_uri']) @@ -146,7 +146,7 @@ def test_landmark_detection_from_source(self): image = client.image(source_uri=_IMAGE_SOURCE) landmarks = image.detect_landmarks(limit=3) self.assertEqual(2, len(landmarks)) - self.assertTrue(isinstance(landmarks[0], EntityAnnotation)) + self.assertIsInstance(landmarks[0], EntityAnnotation) image_request = client.connection._requested[0]['data']['requests'][0] self.assertEqual(_IMAGE_SOURCE, image_request['image']['source']['gcs_image_uri']) @@ -167,7 +167,7 @@ def test_landmark_detection_from_content(self): image = client.image(content=_IMAGE_CONTENT) landmarks = image.detect_landmarks(limit=5) self.assertEqual(2, len(landmarks)) - self.assertTrue(isinstance(landmarks[0], EntityAnnotation)) + self.assertIsInstance(landmarks[0], EntityAnnotation) image_request = client.connection._requested[0]['data']['requests'][0] self.assertEqual(self.B64_IMAGE_CONTENT, image_request['image']['content']) @@ -184,7 +184,7 @@ def test_logo_detection_from_source(self): image = client.image(source_uri=_IMAGE_SOURCE) logos = image.detect_logos(limit=3) self.assertEqual(2, len(logos)) - self.assertTrue(isinstance(logos[0], EntityAnnotation)) + self.assertIsInstance(logos[0], EntityAnnotation) image_request = client.connection._requested[0]['data']['requests'][0] self.assertEqual(_IMAGE_SOURCE, image_request['image']['source']['gcs_image_uri']) @@ -201,7 +201,7 @@ def test_logo_detection_from_content(self): image = client.image(content=_IMAGE_CONTENT) logos = image.detect_logos(limit=5) self.assertEqual(2, len(logos)) - self.assertTrue(isinstance(logos[0], EntityAnnotation)) + self.assertIsInstance(logos[0], EntityAnnotation) image_request = client.connection._requested[0]['data']['requests'][0] self.assertEqual(self.B64_IMAGE_CONTENT, image_request['image']['content']) @@ -218,7 +218,7 @@ def test_text_detection_from_source(self): image = client.image(source_uri=_IMAGE_SOURCE) text = image.detect_text(limit=3) self.assertEqual(3, len(text)) - self.assertTrue(isinstance(text[0], EntityAnnotation)) + self.assertIsInstance(text[0], EntityAnnotation) image_request = client.connection._requested[0]['data']['requests'][0] self.assertEqual(_IMAGE_SOURCE, image_request['image']['source']['gcs_image_uri']) @@ -239,7 +239,7 @@ def test_safe_search_detection_from_source(self): image = client.image(source_uri=_IMAGE_SOURCE) safe_search = image.detect_safe_search() - self.assertTrue(isinstance(safe_search, SafeSearchAnnotation)) + self.assertIsInstance(safe_search, SafeSearchAnnotation) image_request = client.connection._requested[0]['data']['requests'][0] self.assertEqual(_IMAGE_SOURCE, image_request['image']['source']['gcs_image_uri']) From 944e58d9b79117548afdd628aeb9cc564db28678 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 20 Sep 2016 10:53:25 -0700 Subject: [PATCH 2/9] Converting remaining usage of assertTrue(isinstance(...)). --- unit_tests/bigtable/test_cluster.py | 7 +++---- unit_tests/bigtable/test_instance.py | 16 ++++++++-------- unit_tests/datastore/test_batch.py | 4 ++-- unit_tests/datastore/test_transaction.py | 4 ++-- unit_tests/vision/test_client.py | 3 +-- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/unit_tests/bigtable/test_cluster.py b/unit_tests/bigtable/test_cluster.py index b3f601f9a356..a1bb7c5da7bc 100644 --- a/unit_tests/bigtable/test_cluster.py +++ b/unit_tests/bigtable/test_cluster.py @@ -264,8 +264,8 @@ def test_create(self): api_name, args, kwargs = stub.method_calls[0] self.assertEqual(api_name, 'CreateCluster') request_pb, = args - self.assertTrue( - isinstance(request_pb, messages_v2_pb2.CreateClusterRequest)) + self.assertIsInstance(request_pb, + messages_v2_pb2.CreateClusterRequest) self.assertEqual(request_pb.parent, instance.name) self.assertEqual(request_pb.cluster_id, self.CLUSTER_ID) self.assertEqual(request_pb.cluster.serve_nodes, SERVE_NODES) @@ -332,8 +332,7 @@ def test_update(self): api_name, args, kwargs = stub.method_calls[0] self.assertEqual(api_name, 'UpdateCluster') request_pb, = args - self.assertTrue( - isinstance(request_pb, data_v2_pb2.Cluster)) + self.assertIsInstance(request_pb, data_v2_pb2.Cluster) self.assertEqual(request_pb.name, self.CLUSTER_NAME) self.assertEqual(request_pb.serve_nodes, SERVE_NODES) self.assertEqual(kwargs, {}) diff --git a/unit_tests/bigtable/test_instance.py b/unit_tests/bigtable/test_instance.py index d25471efb4d7..6257bbc00fe9 100644 --- a/unit_tests/bigtable/test_instance.py +++ b/unit_tests/bigtable/test_instance.py @@ -274,8 +274,8 @@ def test_create(self): api_name, args, kwargs = stub.method_calls[0] self.assertEqual(api_name, 'CreateInstance') request_pb, = args - self.assertTrue( - isinstance(request_pb, messages_v2_pb2.CreateInstanceRequest)) + self.assertIsInstance(request_pb, + messages_v2_pb2.CreateInstanceRequest) self.assertEqual(request_pb.parent, 'projects/%s' % (self.PROJECT,)) self.assertEqual(request_pb.instance_id, self.INSTANCE_ID) self.assertEqual(request_pb.instance.display_name, self.DISPLAY_NAME) @@ -314,8 +314,8 @@ def test_create_w_explicit_serve_nodes(self): api_name, args, kwargs = stub.method_calls[0] self.assertEqual(api_name, 'CreateInstance') request_pb, = args - self.assertTrue( - isinstance(request_pb, messages_v2_pb2.CreateInstanceRequest)) + self.assertIsInstance(request_pb, + messages_v2_pb2.CreateInstanceRequest) self.assertEqual(request_pb.parent, 'projects/%s' % (self.PROJECT,)) self.assertEqual(request_pb.instance_id, self.INSTANCE_ID) self.assertEqual(request_pb.instance.display_name, self.INSTANCE_ID) @@ -528,8 +528,8 @@ def test_w_defaults(self): instance = Instance(self.INSTANCE_ID, client, self.LOCATION_ID) request_pb = self._callFUT(instance) - self.assertTrue(isinstance(request_pb, - messages_v2_pb.CreateInstanceRequest)) + self.assertIsInstance(request_pb, + messages_v2_pb.CreateInstanceRequest) self.assertEqual(request_pb.instance_id, self.INSTANCE_ID) self.assertEqual(request_pb.parent, self.PARENT) self.assertIsInstance(request_pb.instance, data_v2_pb2.Instance) @@ -558,8 +558,8 @@ def test_w_explicit_serve_nodes(self): request_pb = self._callFUT(instance) - self.assertTrue(isinstance(request_pb, - messages_v2_pb.CreateInstanceRequest)) + self.assertIsInstance(request_pb, + messages_v2_pb.CreateInstanceRequest) self.assertEqual(request_pb.instance_id, self.INSTANCE_ID) self.assertEqual(request_pb.parent, 'projects/' + self.PROJECT) diff --git a/unit_tests/datastore/test_batch.py b/unit_tests/datastore/test_batch.py index cb56e9471996..931b86da1f1e 100644 --- a/unit_tests/datastore/test_batch.py +++ b/unit_tests/datastore/test_batch.py @@ -38,8 +38,8 @@ def test_ctor(self): self.assertEqual(batch.namespace, _NAMESPACE) self.assertTrue(batch._id is None) self.assertEqual(batch._status, batch._INITIAL) - self.assertTrue(isinstance(batch._commit_request, - datastore_pb2.CommitRequest)) + self.assertIsInstance(batch._commit_request, + datastore_pb2.CommitRequest) self.assertTrue(batch.mutations is batch._commit_request.mutations) self.assertEqual(batch._partial_key_entities, []) diff --git a/unit_tests/datastore/test_transaction.py b/unit_tests/datastore/test_transaction.py index 1bd60022f74e..99ced9bc830b 100644 --- a/unit_tests/datastore/test_transaction.py +++ b/unit_tests/datastore/test_transaction.py @@ -35,8 +35,8 @@ def test_ctor_defaults(self): self.assertEqual(xact.connection, connection) self.assertEqual(xact.id, None) self.assertEqual(xact._status, self._getTargetClass()._INITIAL) - self.assertTrue(isinstance(xact._commit_request, - datastore_pb2.CommitRequest)) + self.assertIsInstance(xact._commit_request, + datastore_pb2.CommitRequest) self.assertTrue(xact.mutations is xact._commit_request.mutations) self.assertEqual(len(xact._partial_key_entities), 0) diff --git a/unit_tests/vision/test_client.py b/unit_tests/vision/test_client.py index 565e5e607317..8e7a9685bef2 100644 --- a/unit_tests/vision/test_client.py +++ b/unit_tests/vision/test_client.py @@ -259,8 +259,7 @@ def test_image_properties_detection_from_source(self): image = client.image(source_uri=_IMAGE_SOURCE) image_properties = image.detect_properties() - self.assertTrue(isinstance(image_properties, - ImagePropertiesAnnotation)) + self.assertIsInstance(image_properties, ImagePropertiesAnnotation) image_request = client.connection._requested[0]['data']['requests'][0] self.assertEqual(_IMAGE_SOURCE, image_request['image']['source']['gcs_image_uri']) From 66ea44dffc3c6dcb1e2ac92fcbe74372fa08a593 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 20 Sep 2016 11:03:01 -0700 Subject: [PATCH 3/9] Replacing assertTrue(... is None) with assertIsNone. Did this using: https://gist.github.com/dhermes/c9b2a649aec265eacee3bd6ef76c57e1 --- system_tests/bigquery.py | 4 +- system_tests/storage.py | 8 +- unit_tests/bigquery/test_job.py | 112 +++++++++++------------ unit_tests/bigquery/test_query.py | 32 +++---- unit_tests/bigtable/test_cluster.py | 2 +- unit_tests/datastore/test_batch.py | 10 +- unit_tests/datastore/test_client.py | 28 +++--- unit_tests/datastore/test_query.py | 2 +- unit_tests/datastore/test_transaction.py | 16 ++-- unit_tests/dns/test_zone.py | 2 +- unit_tests/logging/test_entries.py | 18 ++-- unit_tests/pubsub/test_subscription.py | 10 +- unit_tests/storage/test_batch.py | 2 +- unit_tests/storage/test_bucket.py | 16 ++-- unit_tests/storage/test_client.py | 4 +- unit_tests/streaming/test_transfer.py | 26 +++--- unit_tests/test__helpers.py | 6 +- unit_tests/test_operation.py | 10 +- 18 files changed, 154 insertions(+), 154 deletions(-) diff --git a/system_tests/bigquery.py b/system_tests/bigquery.py index b5370efec96f..e55f19fc3f71 100644 --- a/system_tests/bigquery.py +++ b/system_tests/bigquery.py @@ -152,7 +152,7 @@ def test_list_datasets(self): # Retrieve the datasets. all_datasets, token = Config.CLIENT.list_datasets() - self.assertTrue(token is None) + self.assertIsNone(token) created = [dataset for dataset in all_datasets if dataset.name in datasets_to_create and dataset.project == Config.CLIENT.project] @@ -205,7 +205,7 @@ def test_list_tables(self): # Retrieve the tables. all_tables, token = dataset.list_tables() - self.assertTrue(token is None) + self.assertIsNone(token) created = [table for table in all_tables if (table.name in tables_to_create and table.dataset_name == DATASET_NAME)] diff --git a/system_tests/storage.py b/system_tests/storage.py index 6fce4fd85095..2922371a97d5 100644 --- a/system_tests/storage.py +++ b/system_tests/storage.py @@ -306,7 +306,7 @@ def test_root_level_w_delimiter(self): blobs = list(iterator.get_items_from_response(response)) self.assertEqual([blob.name for blob in blobs], ['file01.txt']) self.assertEqual(iterator.page_number, 1) - self.assertTrue(iterator.next_page_token is None) + self.assertIsNone(iterator.next_page_token) self.assertEqual(iterator.prefixes, set(['parent/'])) @RetryErrors(unittest.TestCase.failureException) @@ -316,7 +316,7 @@ def test_first_level(self): blobs = list(iterator.get_items_from_response(response)) self.assertEqual([blob.name for blob in blobs], ['parent/file11.txt']) self.assertEqual(iterator.page_number, 1) - self.assertTrue(iterator.next_page_token is None) + self.assertIsNone(iterator.next_page_token) self.assertEqual(iterator.prefixes, set(['parent/child/'])) @RetryErrors(unittest.TestCase.failureException) @@ -333,7 +333,7 @@ def test_second_level(self): self.assertEqual([blob.name for blob in blobs], expected_names) self.assertEqual(iterator.page_number, 1) - self.assertTrue(iterator.next_page_token is None) + self.assertIsNone(iterator.next_page_token) self.assertEqual(iterator.prefixes, set(['parent/child/grand/', 'parent/child/other/'])) @@ -350,7 +350,7 @@ def test_third_level(self): self.assertEqual([blob.name for blob in blobs], ['parent/child/grand/file31.txt']) self.assertEqual(iterator.page_number, 1) - self.assertTrue(iterator.next_page_token is None) + self.assertIsNone(iterator.next_page_token) self.assertEqual(iterator.prefixes, set()) diff --git a/unit_tests/bigquery/test_job.py b/unit_tests/bigquery/test_job.py index a0ab1f577283..10ba08e1c128 100644 --- a/unit_tests/bigquery/test_job.py +++ b/unit_tests/bigquery/test_job.py @@ -157,39 +157,39 @@ def _verifyBooleanConfigProperties(self, job, config): self.assertEqual(job.allow_jagged_rows, config['allowJaggedRows']) else: - self.assertTrue(job.allow_jagged_rows is None) + self.assertIsNone(job.allow_jagged_rows) if 'allowQuotedNewlines' in config: self.assertEqual(job.allow_quoted_newlines, config['allowQuotedNewlines']) else: - self.assertTrue(job.allow_quoted_newlines is None) + self.assertIsNone(job.allow_quoted_newlines) if 'ignoreUnknownValues' in config: self.assertEqual(job.ignore_unknown_values, config['ignoreUnknownValues']) else: - self.assertTrue(job.ignore_unknown_values is None) + self.assertIsNone(job.ignore_unknown_values) def _verifyEnumConfigProperties(self, job, config): if 'createDisposition' in config: self.assertEqual(job.create_disposition, config['createDisposition']) else: - self.assertTrue(job.create_disposition is None) + self.assertIsNone(job.create_disposition) if 'encoding' in config: self.assertEqual(job.encoding, config['encoding']) else: - self.assertTrue(job.encoding is None) + self.assertIsNone(job.encoding) if 'sourceFormat' in config: self.assertEqual(job.source_format, config['sourceFormat']) else: - self.assertTrue(job.source_format is None) + self.assertIsNone(job.source_format) if 'writeDisposition' in config: self.assertEqual(job.write_disposition, config['writeDisposition']) else: - self.assertTrue(job.write_disposition is None) + self.assertIsNone(job.write_disposition) def _verifyResourceProperties(self, job, resource): self._verifyReadonlyResourceProperties(job, resource) @@ -210,22 +210,22 @@ def _verifyResourceProperties(self, job, resource): self.assertEqual(job.field_delimiter, config['fieldDelimiter']) else: - self.assertTrue(job.field_delimiter is None) + self.assertIsNone(job.field_delimiter) if 'maxBadRecords' in config: self.assertEqual(job.max_bad_records, config['maxBadRecords']) else: - self.assertTrue(job.max_bad_records is None) + self.assertIsNone(job.max_bad_records) if 'quote' in config: self.assertEqual(job.quote_character, config['quote']) else: - self.assertTrue(job.quote_character is None) + self.assertIsNone(job.quote_character) if 'skipLeadingRows' in config: self.assertEqual(job.skip_leading_rows, config['skipLeadingRows']) else: - self.assertTrue(job.skip_leading_rows is None) + self.assertIsNone(job.skip_leading_rows) def test_ctor(self): client = _Client(self.PROJECT) @@ -249,17 +249,17 @@ def test_ctor(self): self.assertEqual(job.output_rows, None) # set/read from resource['configuration']['load'] - self.assertTrue(job.allow_jagged_rows is None) - self.assertTrue(job.allow_quoted_newlines is None) - self.assertTrue(job.create_disposition is None) - self.assertTrue(job.encoding is None) - self.assertTrue(job.field_delimiter is None) - self.assertTrue(job.ignore_unknown_values is None) - self.assertTrue(job.max_bad_records is None) - self.assertTrue(job.quote_character is None) - self.assertTrue(job.skip_leading_rows is None) - self.assertTrue(job.source_format is None) - self.assertTrue(job.write_disposition is None) + self.assertIsNone(job.allow_jagged_rows) + self.assertIsNone(job.allow_quoted_newlines) + self.assertIsNone(job.create_disposition) + self.assertIsNone(job.encoding) + self.assertIsNone(job.field_delimiter) + self.assertIsNone(job.ignore_unknown_values) + self.assertIsNone(job.max_bad_records) + self.assertIsNone(job.quote_character) + self.assertIsNone(job.skip_leading_rows) + self.assertIsNone(job.source_format) + self.assertIsNone(job.write_disposition) def test_ctor_w_schema(self): from google.cloud.bigquery.schema import SchemaField @@ -682,13 +682,13 @@ def _verifyResourceProperties(self, job, resource): self.assertEqual(job.create_disposition, config['createDisposition']) else: - self.assertTrue(job.create_disposition is None) + self.assertIsNone(job.create_disposition) if 'writeDisposition' in config: self.assertEqual(job.write_disposition, config['writeDisposition']) else: - self.assertTrue(job.write_disposition is None) + self.assertIsNone(job.write_disposition) def test_ctor(self): client = _Client(self.PROJECT) @@ -706,8 +706,8 @@ def test_ctor(self): self._verifyInitialReadonlyProperties(job) # set/read from resource['configuration']['copy'] - self.assertTrue(job.create_disposition is None) - self.assertTrue(job.write_disposition is None) + self.assertIsNone(job.create_disposition) + self.assertIsNone(job.write_disposition) def test_from_api_repr_missing_identity(self): self._setUpConstants() @@ -969,25 +969,25 @@ def _verifyResourceProperties(self, job, resource): self.assertEqual(job.compression, config['compression']) else: - self.assertTrue(job.compression is None) + self.assertIsNone(job.compression) if 'destinationFormat' in config: self.assertEqual(job.destination_format, config['destinationFormat']) else: - self.assertTrue(job.destination_format is None) + self.assertIsNone(job.destination_format) if 'fieldDelimiter' in config: self.assertEqual(job.field_delimiter, config['fieldDelimiter']) else: - self.assertTrue(job.field_delimiter is None) + self.assertIsNone(job.field_delimiter) if 'printHeader' in config: self.assertEqual(job.print_header, config['printHeader']) else: - self.assertTrue(job.print_header is None) + self.assertIsNone(job.print_header) def test_ctor(self): client = _Client(self.PROJECT) @@ -1005,10 +1005,10 @@ def test_ctor(self): self._verifyInitialReadonlyProperties(job) # set/read from resource['configuration']['copy'] - self.assertTrue(job.compression is None) - self.assertTrue(job.destination_format is None) - self.assertTrue(job.field_delimiter is None) - self.assertTrue(job.print_header is None) + self.assertIsNone(job.compression) + self.assertIsNone(job.destination_format) + self.assertIsNone(job.field_delimiter) + self.assertIsNone(job.print_header) def test_from_api_repr_missing_identity(self): self._setUpConstants() @@ -1247,34 +1247,34 @@ def _verifyBooleanResourceProperties(self, job, config): self.assertEqual(job.allow_large_results, config['allowLargeResults']) else: - self.assertTrue(job.allow_large_results is None) + self.assertIsNone(job.allow_large_results) if 'flattenResults' in config: self.assertEqual(job.flatten_results, config['flattenResults']) else: - self.assertTrue(job.flatten_results is None) + self.assertIsNone(job.flatten_results) if 'useQueryCache' in config: self.assertEqual(job.use_query_cache, config['useQueryCache']) else: - self.assertTrue(job.use_query_cache is None) + self.assertIsNone(job.use_query_cache) if 'useLegacySql' in config: self.assertEqual(job.use_legacy_sql, config['useLegacySql']) else: - self.assertTrue(job.use_legacy_sql is None) + self.assertIsNone(job.use_legacy_sql) def _verifyIntegerResourceProperties(self, job, config): if 'maximumBillingTier' in config: self.assertEqual(job.maximum_billing_tier, config['maximumBillingTier']) else: - self.assertTrue(job.maximum_billing_tier is None) + self.assertIsNone(job.maximum_billing_tier) if 'maximumBytesBilled' in config: self.assertEqual(job.maximum_bytes_billed, config['maximumBytesBilled']) else: - self.assertTrue(job.maximum_bytes_billed is None) + self.assertIsNone(job.maximum_bytes_billed) def _verifyResourceProperties(self, job, resource): self._verifyReadonlyResourceProperties(job, resource) @@ -1287,7 +1287,7 @@ def _verifyResourceProperties(self, job, resource): self.assertEqual(job.create_disposition, config['createDisposition']) else: - self.assertTrue(job.create_disposition is None) + self.assertIsNone(job.create_disposition) if 'defaultDataset' in config: dataset = job.default_dataset ds_ref = { @@ -1296,7 +1296,7 @@ def _verifyResourceProperties(self, job, resource): } self.assertEqual(ds_ref, config['defaultDataset']) else: - self.assertTrue(job.default_dataset is None) + self.assertIsNone(job.default_dataset) if 'destinationTable' in config: table = job.destination tb_ref = { @@ -1306,17 +1306,17 @@ def _verifyResourceProperties(self, job, resource): } self.assertEqual(tb_ref, config['destinationTable']) else: - self.assertTrue(job.destination is None) + self.assertIsNone(job.destination) if 'priority' in config: self.assertEqual(job.priority, config['priority']) else: - self.assertTrue(job.priority is None) + self.assertIsNone(job.priority) if 'writeDisposition' in config: self.assertEqual(job.write_disposition, config['writeDisposition']) else: - self.assertTrue(job.write_disposition is None) + self.assertIsNone(job.write_disposition) def test_ctor(self): client = _Client(self.PROJECT) @@ -1331,17 +1331,17 @@ def test_ctor(self): self._verifyInitialReadonlyProperties(job) # set/read from resource['configuration']['copy'] - self.assertTrue(job.allow_large_results is None) - self.assertTrue(job.create_disposition is None) - self.assertTrue(job.default_dataset is None) - self.assertTrue(job.destination is None) - self.assertTrue(job.flatten_results is None) - self.assertTrue(job.priority is None) - self.assertTrue(job.use_query_cache is None) - self.assertTrue(job.use_legacy_sql is None) - self.assertTrue(job.write_disposition is None) - self.assertTrue(job.maximum_billing_tier is None) - self.assertTrue(job.maximum_bytes_billed is None) + self.assertIsNone(job.allow_large_results) + self.assertIsNone(job.create_disposition) + self.assertIsNone(job.default_dataset) + self.assertIsNone(job.destination) + self.assertIsNone(job.flatten_results) + self.assertIsNone(job.priority) + self.assertIsNone(job.use_query_cache) + self.assertIsNone(job.use_legacy_sql) + self.assertIsNone(job.write_disposition) + self.assertIsNone(job.maximum_billing_tier) + self.assertIsNone(job.maximum_bytes_billed) def test_from_api_repr_missing_identity(self): self._setUpConstants() diff --git a/unit_tests/bigquery/test_query.py b/unit_tests/bigquery/test_query.py index 87b44d3d0e3f..53d0b15eba8e 100644 --- a/unit_tests/bigquery/test_query.py +++ b/unit_tests/bigquery/test_query.py @@ -86,7 +86,7 @@ def _verifySchema(self, query, resource): expected.get('description')) self.assertEqual(found.fields, expected.get('fields')) else: - self.assertTrue(query.schema is None) + self.assertIsNone(query.schema) def _verifyRows(self, query, resource): expected = resource.get('rows') @@ -111,7 +111,7 @@ def _verifyResourceProperties(self, query, resource): if 'jobReference' in resource: self.assertEqual(query.name, resource['jobReference']['jobId']) else: - self.assertTrue(query.name is None) + self.assertIsNone(query.name) self._verifySchema(query, resource) self._verifyRows(query, resource) @@ -122,21 +122,21 @@ def test_ctor(self): self.assertEqual(query.query, self.QUERY) self.assertTrue(query._client is client) - self.assertTrue(query.cache_hit is None) - self.assertTrue(query.complete is None) - self.assertTrue(query.errors is None) - self.assertTrue(query.name is None) - self.assertTrue(query.page_token is None) + self.assertIsNone(query.cache_hit) + self.assertIsNone(query.complete) + self.assertIsNone(query.errors) + self.assertIsNone(query.name) + self.assertIsNone(query.page_token) self.assertEqual(query.rows, []) - self.assertTrue(query.schema is None) - self.assertTrue(query.total_rows is None) - self.assertTrue(query.total_bytes_processed is None) + self.assertIsNone(query.schema) + self.assertIsNone(query.total_rows) + self.assertIsNone(query.total_bytes_processed) - self.assertTrue(query.default_dataset is None) - self.assertTrue(query.max_results is None) - self.assertTrue(query.preserve_nulls is None) - self.assertTrue(query.use_query_cache is None) - self.assertTrue(query.use_legacy_sql is None) + self.assertIsNone(query.default_dataset) + self.assertIsNone(query.max_results) + self.assertIsNone(query.preserve_nulls) + self.assertIsNone(query.use_query_cache) + self.assertIsNone(query.use_legacy_sql) def test_from_query_job(self): from google.cloud.bigquery.dataset import Dataset @@ -186,7 +186,7 @@ def test_from_query_job_wo_default_dataset(self): def test_job_wo_jobid(self): client = _Client(self.PROJECT) query = self._makeOne(self.QUERY, client) - self.assertTrue(query.job is None) + self.assertIsNone(query.job) def test_job_w_jobid(self): from google.cloud.bigquery.job import QueryJob diff --git a/unit_tests/bigtable/test_cluster.py b/unit_tests/bigtable/test_cluster.py index a1bb7c5da7bc..0b8bc77632df 100644 --- a/unit_tests/bigtable/test_cluster.py +++ b/unit_tests/bigtable/test_cluster.py @@ -257,7 +257,7 @@ def test_create(self): self.assertEqual(result.name, OP_NAME) self.assertTrue(result.target is cluster) self.assertTrue(result.client is client) - self.assertTrue(result.pb_metadata is None) + self.assertIsNone(result.pb_metadata) self.assertEqual(result.metadata, {'request_type': 'CreateCluster'}) self.assertEqual(len(stub.method_calls), 1) diff --git a/unit_tests/datastore/test_batch.py b/unit_tests/datastore/test_batch.py index 931b86da1f1e..9854bb8cd0bc 100644 --- a/unit_tests/datastore/test_batch.py +++ b/unit_tests/datastore/test_batch.py @@ -36,7 +36,7 @@ def test_ctor(self): self.assertEqual(batch.project, _PROJECT) self.assertEqual(batch.connection, connection) self.assertEqual(batch.namespace, _NAMESPACE) - self.assertTrue(batch._id is None) + self.assertIsNone(batch._id) self.assertEqual(batch._status, batch._INITIAL) self.assertIsInstance(batch._commit_request, datastore_pb2.CommitRequest) @@ -49,8 +49,8 @@ def test_current(self): client = _Client(_PROJECT, connection) batch1 = self._makeOne(client) batch2 = self._makeOne(client) - self.assertTrue(batch1.current() is None) - self.assertTrue(batch2.current() is None) + self.assertIsNone(batch1.current()) + self.assertIsNone(batch2.current()) with batch1: self.assertTrue(batch1.current() is batch1) self.assertTrue(batch2.current() is batch1) @@ -59,8 +59,8 @@ def test_current(self): self.assertTrue(batch2.current() is batch2) self.assertTrue(batch1.current() is batch1) self.assertTrue(batch2.current() is batch1) - self.assertTrue(batch1.current() is None) - self.assertTrue(batch2.current() is None) + self.assertIsNone(batch1.current()) + self.assertIsNone(batch2.current()) def test_put_entity_wo_key(self): _PROJECT = 'PROJECT' diff --git a/unit_tests/datastore/test_client.py b/unit_tests/datastore/test_client.py index a4c1c58f7ead..250c829ce20e 100644 --- a/unit_tests/datastore/test_client.py +++ b/unit_tests/datastore/test_client.py @@ -171,9 +171,9 @@ def fallback_mock(project): self.assertEqual(client.namespace, None) self.assertIsInstance(client.connection, _MockConnection) self.assertTrue(client.connection.credentials is creds) - self.assertTrue(client.connection.http is None) - self.assertTrue(client.current_batch is None) - self.assertTrue(client.current_transaction is None) + self.assertIsNone(client.connection.http) + self.assertIsNone(client.current_batch) + self.assertIsNone(client.current_transaction) self.assertEqual(default_called, [None]) def test_ctor_w_explicit_inputs(self): @@ -190,7 +190,7 @@ def test_ctor_w_explicit_inputs(self): self.assertIsInstance(client.connection, _MockConnection) self.assertTrue(client.connection.credentials is creds) self.assertTrue(client.connection.http is http) - self.assertTrue(client.current_batch is None) + self.assertIsNone(client.current_batch) self.assertEqual(list(client._batch_stack), []) def test__push_batch_and__pop_batch(self): @@ -201,7 +201,7 @@ def test__push_batch_and__pop_batch(self): client._push_batch(batch) self.assertEqual(list(client._batch_stack), [batch]) self.assertTrue(client.current_batch is batch) - self.assertTrue(client.current_transaction is None) + self.assertIsNone(client.current_transaction) client._push_batch(xact) self.assertTrue(client.current_batch is xact) self.assertTrue(client.current_transaction is xact) @@ -225,13 +225,13 @@ def _get_multi(*args, **kw): key = object() - self.assertTrue(client.get(key) is None) + self.assertIsNone(client.get(key)) self.assertEqual(_called_with[0][0], ()) self.assertEqual(_called_with[0][1]['keys'], [key]) - self.assertTrue(_called_with[0][1]['missing'] is None) - self.assertTrue(_called_with[0][1]['deferred'] is None) - self.assertTrue(_called_with[0][1]['transaction'] is None) + self.assertIsNone(_called_with[0][1]['missing']) + self.assertIsNone(_called_with[0][1]['deferred']) + self.assertIsNone(_called_with[0][1]['transaction']) def test_get_hit(self): TXN_ID = '123' @@ -380,14 +380,14 @@ def test_get_multi_w_deferred_from_backend_but_not_passed(self): self.assertEqual(key1_pb, k_pbs[0]) self.assertEqual(key2_pb, k_pbs[1]) self.assertFalse(eventual) - self.assertTrue(tid is None) + self.assertIsNone(tid) ds_id, k_pbs, eventual, tid = cw[1] self.assertEqual(ds_id, self.PROJECT) self.assertEqual(len(k_pbs), 1) self.assertEqual(key2_pb, k_pbs[0]) self.assertFalse(eventual) - self.assertTrue(tid is None) + self.assertIsNone(tid) def test_get_multi_hit(self): from google.cloud.datastore.key import Key @@ -563,7 +563,7 @@ def test_put_multi_no_batch_w_partial_key(self): client.connection._commit.append([_KeyPB(key)]) result = client.put_multi([entity]) - self.assertTrue(result is None) + self.assertIsNone(result) self.assertEqual(len(client.connection._commit_cw), 1) (project, @@ -579,7 +579,7 @@ def test_put_multi_no_batch_w_partial_key(self): self.assertEqual(name, 'foo') self.assertEqual(value_pb.string_value, u'bar') - self.assertTrue(transaction_id is None) + self.assertIsNone(transaction_id) def test_put_multi_existing_batch_w_completed_key(self): from google.cloud.datastore.helpers import _property_tuples @@ -641,7 +641,7 @@ def test_delete_multi_no_batch(self): mutated_key = _mutated_pb(self, commit_req.mutations, 'delete') self.assertEqual(mutated_key, key.to_protobuf()) - self.assertTrue(transaction_id is None) + self.assertIsNone(transaction_id) def test_delete_multi_w_existing_batch(self): creds = object() diff --git a/unit_tests/datastore/test_query.py b/unit_tests/datastore/test_query.py index a9a027438d92..073be3675145 100644 --- a/unit_tests/datastore/test_query.py +++ b/unit_tests/datastore/test_query.py @@ -156,7 +156,7 @@ def test_ancestor_deleter_w_key(self): key = Key('KIND', 123, project=self._PROJECT) query = self._makeOne(client=self._makeClient(), ancestor=key) del query.ancestor - self.assertTrue(query.ancestor is None) + self.assertIsNone(query.ancestor) def test_add_filter_setter_w_unknown_operator(self): query = self._makeOne(self._makeClient()) diff --git a/unit_tests/datastore/test_transaction.py b/unit_tests/datastore/test_transaction.py index 99ced9bc830b..0b917e468ce7 100644 --- a/unit_tests/datastore/test_transaction.py +++ b/unit_tests/datastore/test_transaction.py @@ -46,24 +46,24 @@ def test_current(self): client = _Client(_PROJECT, connection) xact1 = self._makeOne(client) xact2 = self._makeOne(client) - self.assertTrue(xact1.current() is None) - self.assertTrue(xact2.current() is None) + self.assertIsNone(xact1.current()) + self.assertIsNone(xact2.current()) with xact1: self.assertTrue(xact1.current() is xact1) self.assertTrue(xact2.current() is xact1) with _NoCommitBatch(client): - self.assertTrue(xact1.current() is None) - self.assertTrue(xact2.current() is None) + self.assertIsNone(xact1.current()) + self.assertIsNone(xact2.current()) with xact2: self.assertTrue(xact1.current() is xact2) self.assertTrue(xact2.current() is xact2) with _NoCommitBatch(client): - self.assertTrue(xact1.current() is None) - self.assertTrue(xact2.current() is None) + self.assertIsNone(xact1.current()) + self.assertIsNone(xact2.current()) self.assertTrue(xact1.current() is xact1) self.assertTrue(xact2.current() is xact1) - self.assertTrue(xact1.current() is None) - self.assertTrue(xact2.current() is None) + self.assertIsNone(xact1.current()) + self.assertIsNone(xact2.current()) def test_begin(self): _PROJECT = 'PROJECT' diff --git a/unit_tests/dns/test_zone.py b/unit_tests/dns/test_zone.py index 2f39e519a9b9..20ae11a7ae37 100644 --- a/unit_tests/dns/test_zone.py +++ b/unit_tests/dns/test_zone.py @@ -88,7 +88,7 @@ def test_ctor_defaults(self): zone = self._makeOne(self.ZONE_NAME) self.assertEqual(zone.name, self.ZONE_NAME) self.assertEqual(zone.dns_name, None) - self.assertTrue(zone._client is None) + self.assertIsNone(zone._client) with self.assertRaises(AttributeError): _ = zone.project diff --git a/unit_tests/logging/test_entries.py b/unit_tests/logging/test_entries.py index 707bab1a0b70..e548136c0f05 100644 --- a/unit_tests/logging/test_entries.py +++ b/unit_tests/logging/test_entries.py @@ -58,11 +58,11 @@ def test_ctor_defaults(self): entry = self._makeOne(PAYLOAD, logger) self.assertEqual(entry.payload, PAYLOAD) self.assertTrue(entry.logger is logger) - self.assertTrue(entry.insert_id is None) - self.assertTrue(entry.timestamp is None) - self.assertTrue(entry.labels is None) - self.assertTrue(entry.severity is None) - self.assertTrue(entry.http_request is None) + self.assertIsNone(entry.insert_id) + self.assertIsNone(entry.timestamp) + self.assertIsNone(entry.labels) + self.assertIsNone(entry.severity) + self.assertIsNone(entry.http_request) def test_ctor_explicit(self): import datetime @@ -107,10 +107,10 @@ def test_from_api_repr_missing_data_no_loggers(self): klass = self._getTargetClass() entry = klass.from_api_repr(API_REPR, client) self.assertEqual(entry.payload, PAYLOAD) - self.assertTrue(entry.insert_id is None) - self.assertTrue(entry.timestamp is None) - self.assertTrue(entry.severity is None) - self.assertTrue(entry.http_request is None) + self.assertIsNone(entry.insert_id) + self.assertIsNone(entry.timestamp) + self.assertIsNone(entry.severity) + self.assertIsNone(entry.http_request) logger = entry.logger self.assertIsInstance(logger, _Logger) self.assertTrue(logger.client is client) diff --git a/unit_tests/pubsub/test_subscription.py b/unit_tests/pubsub/test_subscription.py index f5708b80350b..fc78e25d4c9f 100644 --- a/unit_tests/pubsub/test_subscription.py +++ b/unit_tests/pubsub/test_subscription.py @@ -54,7 +54,7 @@ def test_ctor_w_client_wo_topic(self): client = _Client(project=self.PROJECT) subscription = self._makeOne(self.SUB_NAME, client=client) self.assertEqual(subscription.name, self.SUB_NAME) - self.assertTrue(subscription.topic is None) + self.assertIsNone(subscription.topic) def test_ctor_w_both_topic_and_client(self): client1 = _Client(project=self.PROJECT) @@ -94,7 +94,7 @@ def test_from_api_repr_w_deleted_topic(self): client = _Client(project=self.PROJECT) subscription = klass.from_api_repr(resource, client) self.assertEqual(subscription.name, self.SUB_NAME) - self.assertTrue(subscription.topic is None) + self.assertIsNone(subscription.topic) self.assertEqual(subscription.ack_deadline, self.DEADLINE) self.assertEqual(subscription.push_endpoint, self.ENDPOINT) @@ -153,7 +153,7 @@ def test_autoack_defaults(self): self.assertTrue(auto_ack._subscription is subscription) self.assertEqual(auto_ack._return_immediately, False) self.assertEqual(auto_ack._max_messages, 1) - self.assertTrue(auto_ack._client is None) + self.assertIsNone(auto_ack._client) def test_autoack_explicit(self): from google.cloud.pubsub.subscription import AutoAck @@ -686,7 +686,7 @@ def test_ctor_defaults(self): auto_ack = self._makeOne(subscription) self.assertEqual(auto_ack._return_immediately, False) self.assertEqual(auto_ack._max_messages, 1) - self.assertTrue(auto_ack._client is None) + self.assertIsNone(auto_ack._client) def test_ctor_explicit(self): CLIENT = object() @@ -709,7 +709,7 @@ def test___enter___w_defaults(self): self.assertTrue(returned is auto_ack) self.assertEqual(subscription._return_immediately, False) self.assertEqual(subscription._max_messages, 1) - self.assertTrue(subscription._client is None) + self.assertIsNone(subscription._client) def test___enter___w_explicit(self): CLIENT = object() diff --git a/unit_tests/storage/test_batch.py b/unit_tests/storage/test_batch.py index 5ac310284773..43c0b1fb2cde 100644 --- a/unit_tests/storage/test_batch.py +++ b/unit_tests/storage/test_batch.py @@ -90,7 +90,7 @@ def test_current(self): credentials = _Credentials() client = Client(project=project, credentials=credentials) batch1 = self._makeOne(client) - self.assertTrue(batch1.current() is None) + self.assertIsNone(batch1.current()) client._push_batch(batch1) self.assertTrue(batch1.current() is batch1) diff --git a/unit_tests/storage/test_bucket.py b/unit_tests/storage/test_bucket.py index 281fbe4308b6..b35a30481dd6 100644 --- a/unit_tests/storage/test_bucket.py +++ b/unit_tests/storage/test_bucket.py @@ -259,7 +259,7 @@ def test_get_blob_miss(self): client = _Client(connection) bucket = self._makeOne(name=NAME) result = bucket.get_blob(NONESUCH, client=client) - self.assertTrue(result is None) + self.assertIsNone(result) kw, = connection._requested self.assertEqual(kw['method'], 'GET') self.assertEqual(kw['path'], '/b/%s/o/%s' % (NAME, NONESUCH)) @@ -363,7 +363,7 @@ def test_delete_hit(self): client = _Client(connection) bucket = self._makeOne(client=client, name=NAME) result = bucket.delete(force=True) - self.assertTrue(result is None) + self.assertIsNone(result) expected_cw = [{ 'method': 'DELETE', 'path': bucket.path, @@ -388,7 +388,7 @@ def test_delete_force_delete_blobs(self): client = _Client(connection) bucket = self._makeOne(client=client, name=NAME) result = bucket.delete(force=True) - self.assertTrue(result is None) + self.assertIsNone(result) expected_cw = [{ 'method': 'DELETE', 'path': bucket.path, @@ -406,7 +406,7 @@ def test_delete_force_miss_blobs(self): client = _Client(connection) bucket = self._makeOne(client=client, name=NAME) result = bucket.delete(force=True) - self.assertTrue(result is None) + self.assertIsNone(result) expected_cw = [{ 'method': 'DELETE', 'path': bucket.path, @@ -453,7 +453,7 @@ def test_delete_blob_hit(self): client = _Client(connection) bucket = self._makeOne(client=client, name=NAME) result = bucket.delete_blob(BLOB_NAME) - self.assertTrue(result is None) + self.assertIsNone(result) kw, = connection._requested self.assertEqual(kw['method'], 'DELETE') self.assertEqual(kw['path'], '/b/%s/o/%s' % (NAME, BLOB_NAME)) @@ -682,7 +682,7 @@ def test_enable_logging_defaults(self): LOG_BUCKET = 'logs' before = {'logging': None} bucket = self._makeOne(name=NAME, properties=before) - self.assertTrue(bucket.get_logging() is None) + self.assertIsNone(bucket.get_logging()) bucket.enable_logging(LOG_BUCKET) info = bucket.get_logging() self.assertEqual(info['logBucket'], LOG_BUCKET) @@ -694,7 +694,7 @@ def test_enable_logging(self): LOG_PFX = 'pfx' before = {'logging': None} bucket = self._makeOne(name=NAME, properties=before) - self.assertTrue(bucket.get_logging() is None) + self.assertIsNone(bucket.get_logging()) bucket.enable_logging(LOG_BUCKET, LOG_PFX) info = bucket.get_logging() self.assertEqual(info['logBucket'], LOG_BUCKET) @@ -706,7 +706,7 @@ def test_disable_logging(self): bucket = self._makeOne(name=NAME, properties=before) self.assertTrue(bucket.get_logging() is not None) bucket.disable_logging() - self.assertTrue(bucket.get_logging() is None) + self.assertIsNone(bucket.get_logging()) def test_metageneration(self): METAGENERATION = 42 diff --git a/unit_tests/storage/test_client.py b/unit_tests/storage/test_client.py index a7149fb091a8..a0ca33c1c999 100644 --- a/unit_tests/storage/test_client.py +++ b/unit_tests/storage/test_client.py @@ -34,7 +34,7 @@ def test_ctor_connection_type(self): self.assertEqual(client.project, PROJECT) self.assertIsInstance(client.connection, Connection) self.assertTrue(client.connection.credentials is CREDENTIALS) - self.assertTrue(client.current_batch is None) + self.assertIsNone(client.current_batch) self.assertEqual(list(client._batch_stack), []) def test__push_batch_and__pop_batch(self): @@ -77,7 +77,7 @@ def test_connection_getter_no_batch(self): CREDENTIALS = _Credentials() client = self._makeOne(project=PROJECT, credentials=CREDENTIALS) self.assertTrue(client.connection is client._connection) - self.assertTrue(client.current_batch is None) + self.assertIsNone(client.current_batch) def test_connection_getter_with_batch(self): from google.cloud.storage.batch import Batch diff --git a/unit_tests/streaming/test_transfer.py b/unit_tests/streaming/test_transfer.py index cff2c1f66b7f..7c56a99dda54 100644 --- a/unit_tests/streaming/test_transfer.py +++ b/unit_tests/streaming/test_transfer.py @@ -19,10 +19,10 @@ def test_ctor_defaults(self): self.assertFalse(xfer.close_stream) self.assertEqual(xfer.chunksize, _DEFAULT_CHUNKSIZE) self.assertTrue(xfer.auto_transfer) - self.assertTrue(xfer.bytes_http is None) - self.assertTrue(xfer.http is None) + self.assertIsNone(xfer.bytes_http) + self.assertIsNone(xfer.http) self.assertEqual(xfer.num_retries, 5) - self.assertTrue(xfer.url is None) + self.assertIsNone(xfer.url) self.assertFalse(xfer.initialized) def test_ctor_explicit(self): @@ -159,10 +159,10 @@ def test_ctor_defaults(self): stream = _Stream() download = self._makeOne(stream) self.assertTrue(download.stream is stream) - self.assertTrue(download._initial_response is None) + self.assertIsNone(download._initial_response) self.assertEqual(download.progress, 0) - self.assertTrue(download.total_size is None) - self.assertTrue(download.encoding is None) + self.assertIsNone(download.total_size) + self.assertIsNone(download.encoding) def test_ctor_w_kwds(self): stream = _Stream() @@ -208,7 +208,7 @@ def test_from_stream_defaults(self): download = klass.from_stream(stream) self.assertTrue(download.stream is stream) self.assertTrue(download.auto_transfer) - self.assertTrue(download.total_size is None) + self.assertIsNone(download.total_size) def test_from_stream_explicit(self): CHUNK_SIZE = 1 << 18 @@ -308,7 +308,7 @@ def test_initialize_download_w_autotransfer_w_content_location(self): with _Monkey(MUT, make_api_request=requester): download.initialize_download(request, http) - self.assertTrue(download._initial_response is None) + self.assertIsNone(download._initial_response) self.assertEqual(download.total_size, 0) self.assertTrue(download.http is http) self.assertEqual(download.url, REDIRECT_URL) @@ -795,13 +795,13 @@ def test_ctor_defaults(self): stream = _Stream() upload = self._makeOne(stream) self.assertTrue(upload.stream is stream) - self.assertTrue(upload._final_response is None) - self.assertTrue(upload._server_chunk_granularity is None) + self.assertIsNone(upload._final_response) + self.assertIsNone(upload._server_chunk_granularity) self.assertFalse(upload.complete) self.assertEqual(upload.mime_type, self.MIME_TYPE) self.assertEqual(upload.progress, 0) - self.assertTrue(upload.strategy is None) - self.assertTrue(upload.total_size is None) + self.assertIsNone(upload.strategy) + self.assertIsNone(upload.total_size) self.assertEqual(upload.chunksize, _DEFAULT_CHUNKSIZE) def test_ctor_w_kwds(self): @@ -1253,7 +1253,7 @@ def test_refresh_upload_state_w_error(self): def test__get_range_header_miss(self): upload = self._makeOne(_Stream()) response = _makeResponse(None) - self.assertTrue(upload._get_range_header(response) is None) + self.assertIsNone(upload._get_range_header(response)) def test__get_range_header_w_Range(self): upload = self._makeOne(_Stream()) diff --git a/unit_tests/test__helpers.py b/unit_tests/test__helpers.py index 923fd7e6df4e..21ea48a58107 100644 --- a/unit_tests/test__helpers.py +++ b/unit_tests/test__helpers.py @@ -30,7 +30,7 @@ def test_it(self): batch1, batch2 = object(), object() batches = self._makeOne() self.assertEqual(list(batches), []) - self.assertTrue(batches.top is None) + self.assertIsNone(batches.top) batches.push(batch1) self.assertTrue(batches.top is batch1) batches.push(batch2) @@ -40,7 +40,7 @@ def test_it(self): self.assertTrue(batches.top is batch1) self.assertEqual(list(batches), [batch1]) popped = batches.pop() - self.assertTrue(batches.top is None) + self.assertIsNone(batches.top) self.assertEqual(list(batches), []) @@ -467,7 +467,7 @@ def _callFUT(self, value): return _millis_from_datetime(value) def test_w_none(self): - self.assertTrue(self._callFUT(None) is None) + self.assertIsNone(self._callFUT(None)) def test_w_utc_datetime(self): import datetime diff --git a/unit_tests/test_operation.py b/unit_tests/test_operation.py index ce23e6e5cd09..6e3e5d40cde6 100644 --- a/unit_tests/test_operation.py +++ b/unit_tests/test_operation.py @@ -105,8 +105,8 @@ def test_ctor_defaults(self): self.OPERATION_NAME, client) self.assertEqual(operation.name, self.OPERATION_NAME) self.assertTrue(operation.client is client) - self.assertTrue(operation.target is None) - self.assertTrue(operation.pb_metadata is None) + self.assertIsNone(operation.target) + self.assertIsNone(operation.pb_metadata) self.assertEqual(operation.metadata, {}) def test_ctor_explicit(self): @@ -116,7 +116,7 @@ def test_ctor_explicit(self): self.OPERATION_NAME, client, pb_metadata, foo='bar') self.assertEqual(operation.name, self.OPERATION_NAME) self.assertTrue(operation.client is client) - self.assertTrue(operation.target is None) + self.assertIsNone(operation.target) self.assertTrue(operation.pb_metadata is pb_metadata) self.assertEqual(operation.metadata, {'foo': 'bar'}) @@ -130,7 +130,7 @@ def test_from_pb_wo_metadata_or_kw(self): self.assertEqual(operation.name, self.OPERATION_NAME) self.assertTrue(operation.client is client) - self.assertTrue(operation.pb_metadata is None) + self.assertIsNone(operation.pb_metadata) self.assertEqual(operation.metadata, {}) def test_from_pb_w_unknown_metadata(self): @@ -150,7 +150,7 @@ def test_from_pb_w_unknown_metadata(self): self.assertEqual(operation.name, self.OPERATION_NAME) self.assertTrue(operation.client is client) - self.assertTrue(operation.pb_metadata is None) + self.assertIsNone(operation.pb_metadata) self.assertEqual(operation.metadata, {}) def test_from_pb_w_metadata_and_kwargs(self): From 67d0385516d63173112060b9e6e6cc649b013614 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 20 Sep 2016 11:13:53 -0700 Subject: [PATCH 4/9] Replacing assertTrue(... is ...) with assertIs(..., ...). Did this using: https://gist.github.com/dhermes/4e36f11eba22845309a484369ce56d41 --- system_tests/bigtable.py | 2 +- system_tests/datastore.py | 2 +- system_tests/pubsub.py | 4 +- system_tests/storage.py | 2 +- unit_tests/bigquery/test__helpers.py | 6 +- unit_tests/bigquery/test_client.py | 20 ++-- unit_tests/bigquery/test_dataset.py | 10 +- unit_tests/bigquery/test_job.py | 30 +++--- unit_tests/bigquery/test_query.py | 16 +-- unit_tests/bigquery/test_table.py | 8 +- unit_tests/bigtable/test_client.py | 8 +- unit_tests/bigtable/test_cluster.py | 14 +-- unit_tests/bigtable/test_column_family.py | 8 +- unit_tests/bigtable/test_instance.py | 12 +-- unit_tests/bigtable/test_row.py | 18 ++-- unit_tests/bigtable/test_row_data.py | 8 +- unit_tests/bigtable/test_row_filters.py | 44 ++++---- unit_tests/bigtable/test_table.py | 4 +- unit_tests/datastore/test_batch.py | 14 +-- unit_tests/datastore/test_client.py | 22 ++-- unit_tests/datastore/test_connection.py | 10 +- unit_tests/datastore/test_helpers.py | 4 +- unit_tests/datastore/test_key.py | 8 +- unit_tests/datastore/test_query.py | 16 +-- unit_tests/datastore/test_transaction.py | 14 +-- unit_tests/dns/test_changes.py | 6 +- unit_tests/dns/test_client.py | 10 +- unit_tests/dns/test_resource_record_set.py | 4 +- unit_tests/dns/test_zone.py | 12 +-- unit_tests/language/test_client.py | 4 +- unit_tests/logging/test__gax.py | 12 +-- unit_tests/logging/test_client.py | 42 ++++---- unit_tests/logging/test_connection.py | 4 +- unit_tests/logging/test_entries.py | 10 +- unit_tests/logging/test_logger.py | 16 +-- unit_tests/logging/test_metric.py | 8 +- unit_tests/logging/test_sink.py | 8 +- unit_tests/pubsub/test__gax.py | 14 +-- unit_tests/pubsub/test_client.py | 22 ++-- unit_tests/pubsub/test_connection.py | 6 +- unit_tests/pubsub/test_subscription.py | 26 ++--- unit_tests/pubsub/test_topic.py | 20 ++-- unit_tests/resource_manager/test_client.py | 2 +- unit_tests/storage/test__helpers.py | 2 +- unit_tests/storage/test_acl.py | 14 +-- unit_tests/storage/test_batch.py | 22 ++-- unit_tests/storage/test_blob.py | 8 +- unit_tests/storage/test_bucket.py | 26 ++--- unit_tests/storage/test_client.py | 26 ++--- unit_tests/streaming/test_buffered_stream.py | 4 +- unit_tests/streaming/test_http_wrapper.py | 6 +- unit_tests/streaming/test_stream_slice.py | 2 +- unit_tests/streaming/test_transfer.py | 102 +++++++++---------- unit_tests/test__helpers.py | 12 +-- unit_tests/test_client.py | 12 +-- unit_tests/test_connection.py | 16 +-- unit_tests/test_credentials.py | 2 +- unit_tests/test_iterator.py | 2 +- unit_tests/test_operation.py | 12 +-- unit_tests/translate/test_client.py | 4 +- 60 files changed, 401 insertions(+), 401 deletions(-) diff --git a/system_tests/bigtable.py b/system_tests/bigtable.py index 6ef94f91c0a1..48688d1a6e25 100644 --- a/system_tests/bigtable.py +++ b/system_tests/bigtable.py @@ -231,7 +231,7 @@ def test_create_column_family(self): self.assertEqual(len(col_fams), 1) retrieved_col_fam = col_fams[COLUMN_FAMILY_ID1] - self.assertTrue(retrieved_col_fam._table is column_family._table) + self.assertIs(retrieved_col_fam._table, column_family._table) self.assertEqual(retrieved_col_fam.column_family_id, column_family.column_family_id) self.assertEqual(retrieved_col_fam.gc_rule, gc_rule) diff --git a/system_tests/datastore.py b/system_tests/datastore.py index 7de7a5494f44..df084e1412a2 100644 --- a/system_tests/datastore.py +++ b/system_tests/datastore.py @@ -264,7 +264,7 @@ def test_limit_queries(self): self.assertEqual(len(character_entities), limit) # Check cursor after fetch. - self.assertTrue(cursor is not None) + self.assertIs(cursor, not None) # Fetch remaining of characters. new_character_entities = list(iterator) diff --git a/system_tests/pubsub.py b/system_tests/pubsub.py index 98158433e5a5..6391945b5d3a 100644 --- a/system_tests/pubsub.py +++ b/system_tests/pubsub.py @@ -112,7 +112,7 @@ def test_create_subscription_defaults(self): self.to_delete.append(subscription) self.assertTrue(subscription.exists()) self.assertEqual(subscription.name, SUBSCRIPTION_NAME) - self.assertTrue(subscription.topic is topic) + self.assertIs(subscription.topic, topic) def test_create_subscription_w_ack_deadline(self): TOPIC_NAME = 'create-sub-ack' + unique_resource_id('-') @@ -128,7 +128,7 @@ def test_create_subscription_w_ack_deadline(self): self.assertTrue(subscription.exists()) self.assertEqual(subscription.name, SUBSCRIPTION_NAME) self.assertEqual(subscription.ack_deadline, 120) - self.assertTrue(subscription.topic is topic) + self.assertIs(subscription.topic, topic) def test_list_subscriptions(self): TOPIC_NAME = 'list-sub' + unique_resource_id('-') diff --git a/system_tests/storage.py b/system_tests/storage.py index 2922371a97d5..a3903830347c 100644 --- a/system_tests/storage.py +++ b/system_tests/storage.py @@ -261,7 +261,7 @@ def test_paginate_files(self): blobs = list(iterator.get_items_from_response(response)) self.assertEqual(len(blobs), count) self.assertEqual(iterator.page_number, 1) - self.assertTrue(iterator.next_page_token is not None) + self.assertIs(iterator.next_page_token, not None) response = iterator.get_next_page_response() last_blobs = list(iterator.get_items_from_response(response)) diff --git a/unit_tests/bigquery/test__helpers.py b/unit_tests/bigquery/test__helpers.py index 72a95e5f0dcc..8cb2a3d1389a 100644 --- a/unit_tests/bigquery/test__helpers.py +++ b/unit_tests/bigquery/test__helpers.py @@ -343,8 +343,8 @@ def __init__(self): value = object() wrapper.attr = value - self.assertTrue(wrapper.attr is value) - self.assertTrue(wrapper._configuration._attr is value) + self.assertIs(wrapper.attr, value) + self.assertIs(wrapper._configuration._attr, value) del wrapper.attr self.assertEqual(wrapper.attr, None) @@ -437,7 +437,7 @@ class _Test(object): def test_class_getter(self): descriptor, klass = self._descriptor_and_klass() - self.assertTrue(klass.udf_resources is descriptor) + self.assertIs(klass.udf_resources, descriptor) def test_instance_getter_empty(self): _, klass = self._descriptor_and_klass() diff --git a/unit_tests/bigquery/test_client.py b/unit_tests/bigquery/test_client.py index 5279c716f57d..e72f24e1230e 100644 --- a/unit_tests/bigquery/test_client.py +++ b/unit_tests/bigquery/test_client.py @@ -31,8 +31,8 @@ def test_ctor(self): http = object() client = self._makeOne(project=PROJECT, credentials=creds, http=http) self.assertIsInstance(client.connection, Connection) - self.assertTrue(client.connection.credentials is creds) - self.assertTrue(client.connection.http is http) + self.assertIs(client.connection.credentials, creds) + self.assertIs(client.connection.http, http) def test_list_projects_defaults(self): from google.cloud.bigquery.client import Project @@ -167,7 +167,7 @@ def test_dataset(self): dataset = client.dataset(DATASET) self.assertIsInstance(dataset, Dataset) self.assertEqual(dataset.name, DATASET) - self.assertTrue(dataset._client is client) + self.assertIs(dataset._client, client) def test_job_from_resource_unknown_type(self): PROJECT = 'PROJECT' @@ -395,10 +395,10 @@ def test_load_table_from_storage(self): destination = dataset.table(DESTINATION) job = client.load_table_from_storage(JOB, destination, SOURCE_URI) self.assertIsInstance(job, LoadTableFromStorageJob) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self.assertEqual(job.name, JOB) self.assertEqual(list(job.source_uris), [SOURCE_URI]) - self.assertTrue(job.destination is destination) + self.assertIs(job.destination, destination) def test_copy_table(self): from google.cloud.bigquery.job import CopyJob @@ -415,10 +415,10 @@ def test_copy_table(self): destination = dataset.table(DESTINATION) job = client.copy_table(JOB, destination, source) self.assertIsInstance(job, CopyJob) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self.assertEqual(job.name, JOB) self.assertEqual(list(job.sources), [source]) - self.assertTrue(job.destination is destination) + self.assertIs(job.destination, destination) def test_extract_table_to_storage(self): from google.cloud.bigquery.job import ExtractTableToStorageJob @@ -434,7 +434,7 @@ def test_extract_table_to_storage(self): source = dataset.table(SOURCE) job = client.extract_table_to_storage(JOB, source, DESTINATION) self.assertIsInstance(job, ExtractTableToStorageJob) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self.assertEqual(job.name, JOB) self.assertEqual(job.source, source) self.assertEqual(list(job.destination_uris), [DESTINATION]) @@ -449,7 +449,7 @@ def test_run_async_query(self): client = self._makeOne(project=PROJECT, credentials=creds, http=http) job = client.run_async_query(JOB, QUERY) self.assertIsInstance(job, QueryJob) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self.assertEqual(job.name, JOB) self.assertEqual(job.query, QUERY) @@ -462,7 +462,7 @@ def test_run_sync_query(self): client = self._makeOne(project=PROJECT, credentials=creds, http=http) job = client.run_sync_query(QUERY) self.assertIsInstance(job, QueryResults) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self.assertEqual(job.name, None) self.assertEqual(job.query, QUERY) diff --git a/unit_tests/bigquery/test_dataset.py b/unit_tests/bigquery/test_dataset.py index 39985783e649..ab0d761363b7 100644 --- a/unit_tests/bigquery/test_dataset.py +++ b/unit_tests/bigquery/test_dataset.py @@ -176,7 +176,7 @@ def test_ctor(self): client = _Client(self.PROJECT) dataset = self._makeOne(self.DS_NAME, client) self.assertEqual(dataset.name, self.DS_NAME) - self.assertTrue(dataset._client is client) + self.assertIs(dataset._client, client) self.assertEqual(dataset.project, client.project) self.assertEqual( dataset.path, @@ -285,7 +285,7 @@ def test_from_api_repr_bare(self): } klass = self._getTargetClass() dataset = klass.from_api_repr(RESOURCE, client=client) - self.assertTrue(dataset._client is client) + self.assertIs(dataset._client, client) self._verifyResourceProperties(dataset, RESOURCE) def test_from_api_repr_w_properties(self): @@ -293,7 +293,7 @@ def test_from_api_repr_w_properties(self): RESOURCE = self._makeResource() klass = self._getTargetClass() dataset = klass.from_api_repr(RESOURCE, client=client) - self.assertTrue(dataset._client is client) + self.assertIs(dataset._client, client) self._verifyResourceProperties(dataset, RESOURCE) def test__parse_access_grants_w_unknown_entity_type(self): @@ -743,7 +743,7 @@ def test_table_wo_schema(self): table = dataset.table('table_name') self.assertIsInstance(table, Table) self.assertEqual(table.name, 'table_name') - self.assertTrue(table._dataset is dataset) + self.assertIs(table._dataset, dataset) self.assertEqual(table.schema, []) def test_table_w_schema(self): @@ -757,7 +757,7 @@ def test_table_w_schema(self): table = dataset.table('table_name', schema=[full_name, age]) self.assertIsInstance(table, Table) self.assertEqual(table.name, 'table_name') - self.assertTrue(table._dataset is dataset) + self.assertIs(table._dataset, dataset) self.assertEqual(table.schema, [full_name, age]) diff --git a/unit_tests/bigquery/test_job.py b/unit_tests/bigquery/test_job.py index 10ba08e1c128..b0c8256bbddf 100644 --- a/unit_tests/bigquery/test_job.py +++ b/unit_tests/bigquery/test_job.py @@ -231,9 +231,9 @@ def test_ctor(self): client = _Client(self.PROJECT) table = _Table() job = self._makeOne(self.JOB_NAME, table, [self.SOURCE1], client) - self.assertTrue(job.destination is table) + self.assertIs(job.destination, table) self.assertEqual(list(job.source_uris), [self.SOURCE1]) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self.assertEqual(job.job_type, self.JOB_TYPE) self.assertEqual( job.path, @@ -403,7 +403,7 @@ def test_from_api_repr_bare(self): } klass = self._getTargetClass() job = klass.from_api_repr(RESOURCE, client=client) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self._verifyResourceProperties(job, RESOURCE) def test_from_api_repr_w_properties(self): @@ -411,7 +411,7 @@ def test_from_api_repr_w_properties(self): RESOURCE = self._makeResource() klass = self._getTargetClass() dataset = klass.from_api_repr(RESOURCE, client=client) - self.assertTrue(dataset._client is client) + self.assertIs(dataset._client, client) self._verifyResourceProperties(dataset, RESOURCE) def test_begin_w_already_running(self): @@ -695,9 +695,9 @@ def test_ctor(self): source = _Table(self.SOURCE_TABLE) destination = _Table(self.DESTINATION_TABLE) job = self._makeOne(self.JOB_NAME, destination, [source], client) - self.assertTrue(job.destination is destination) + self.assertIs(job.destination, destination) self.assertEqual(job.sources, [source]) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self.assertEqual(job.job_type, self.JOB_TYPE) self.assertEqual( job.path, @@ -757,7 +757,7 @@ def test_from_api_repr_bare(self): } klass = self._getTargetClass() job = klass.from_api_repr(RESOURCE, client=client) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self._verifyResourceProperties(job, RESOURCE) def test_from_api_repr_w_properties(self): @@ -765,7 +765,7 @@ def test_from_api_repr_w_properties(self): RESOURCE = self._makeResource() klass = self._getTargetClass() dataset = klass.from_api_repr(RESOURCE, client=client) - self.assertTrue(dataset._client is client) + self.assertIs(dataset._client, client) self._verifyResourceProperties(dataset, RESOURCE) def test_begin_w_bound_client(self): @@ -996,7 +996,7 @@ def test_ctor(self): client) self.assertEqual(job.source, source) self.assertEqual(job.destination_uris, [self.DESTINATION_URI]) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self.assertEqual(job.job_type, self.JOB_TYPE) self.assertEqual( job.path, @@ -1054,7 +1054,7 @@ def test_from_api_repr_bare(self): } klass = self._getTargetClass() job = klass.from_api_repr(RESOURCE, client=client) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self._verifyResourceProperties(job, RESOURCE) def test_from_api_repr_w_properties(self): @@ -1062,7 +1062,7 @@ def test_from_api_repr_w_properties(self): RESOURCE = self._makeResource() klass = self._getTargetClass() dataset = klass.from_api_repr(RESOURCE, client=client) - self.assertTrue(dataset._client is client) + self.assertIs(dataset._client, client) self._verifyResourceProperties(dataset, RESOURCE) def test_begin_w_bound_client(self): @@ -1322,7 +1322,7 @@ def test_ctor(self): client = _Client(self.PROJECT) job = self._makeOne(self.JOB_NAME, self.QUERY, client) self.assertEqual(job.query, self.QUERY) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self.assertEqual(job.job_type, self.JOB_TYPE) self.assertEqual( job.path, @@ -1380,7 +1380,7 @@ def test_from_api_repr_bare(self): } klass = self._getTargetClass() job = klass.from_api_repr(RESOURCE, client=client) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self._verifyResourceProperties(job, RESOURCE) def test_from_api_repr_w_properties(self): @@ -1393,7 +1393,7 @@ def test_from_api_repr_w_properties(self): } klass = self._getTargetClass() dataset = klass.from_api_repr(RESOURCE, client=client) - self.assertTrue(dataset._client is client) + self.assertIs(dataset._client, client) self._verifyResourceProperties(dataset, RESOURCE) def test_results(self): @@ -1402,7 +1402,7 @@ def test_results(self): job = self._makeOne(self.JOB_NAME, self.QUERY, client) results = job.results() self.assertIsInstance(results, QueryResults) - self.assertTrue(results._job is job) + self.assertIs(results._job, job) def test_begin_w_bound_client(self): PATH = 'projects/%s/jobs' % self.PROJECT diff --git a/unit_tests/bigquery/test_query.py b/unit_tests/bigquery/test_query.py index 53d0b15eba8e..3549b1114082 100644 --- a/unit_tests/bigquery/test_query.py +++ b/unit_tests/bigquery/test_query.py @@ -120,7 +120,7 @@ def test_ctor(self): client = _Client(self.PROJECT) query = self._makeOne(self.QUERY, client) self.assertEqual(query.query, self.QUERY) - self.assertTrue(query._client is client) + self.assertIs(query._client, client) self.assertIsNone(query.cache_hit) self.assertIsNone(query.complete) @@ -156,10 +156,10 @@ def test_from_query_job(self): query = klass.from_query_job(job) self.assertEqual(query.query, self.QUERY) - self.assertTrue(query._client is client) - self.assertTrue(query._job is job) + self.assertIs(query._client, client) + self.assertIs(query._job, job) self.assertEqual(query.udf_resources, job.udf_resources) - self.assertTrue(query.default_dataset is dataset) + self.assertIs(query.default_dataset, dataset) self.assertTrue(query.use_query_cache) self.assertTrue(query.use_legacy_sql) @@ -176,8 +176,8 @@ def test_from_query_job_wo_default_dataset(self): query = klass.from_query_job(job) self.assertEqual(query.query, self.QUERY) - self.assertTrue(query._client is client) - self.assertTrue(query._job is job) + self.assertIs(query._client, client) + self.assertIs(query._job, job) self.assertEqual(query.udf_resources, job.udf_resources) self.assertIsNone(query.default_dataset) self.assertIsNone(query.use_query_cache) @@ -200,10 +200,10 @@ def test_job_w_jobid(self): job = query.job self.assertIsInstance(job, QueryJob) self.assertEqual(job.query, self.QUERY) - self.assertTrue(job._client is client) + self.assertIs(job._client, client) self.assertEqual(job.name, SERVER_GENERATED) fetched_later = query.job - self.assertTrue(fetched_later is job) + self.assertIs(fetched_later, job) def test_schema(self): client = _Client(self.PROJECT) diff --git a/unit_tests/bigquery/test_table.py b/unit_tests/bigquery/test_table.py index 075fc951bd19..583518c3af97 100644 --- a/unit_tests/bigquery/test_table.py +++ b/unit_tests/bigquery/test_table.py @@ -135,7 +135,7 @@ def test_ctor(self): dataset = _Dataset(client) table = self._makeOne(self.TABLE_NAME, dataset) self.assertEqual(table.name, self.TABLE_NAME) - self.assertTrue(table._dataset is dataset) + self.assertIs(table._dataset, dataset) self.assertEqual(table.project, self.PROJECT) self.assertEqual(table.dataset_name, self.DS_NAME) self.assertEqual( @@ -378,7 +378,7 @@ def test_from_api_repr_bare(self): klass = self._getTargetClass() table = klass.from_api_repr(RESOURCE, dataset) self.assertEqual(table.name, self.TABLE_NAME) - self.assertTrue(table._dataset is dataset) + self.assertIs(table._dataset, dataset) self._verifyResourceProperties(table, RESOURCE) def test_from_api_repr_w_properties(self): @@ -387,7 +387,7 @@ def test_from_api_repr_w_properties(self): RESOURCE = self._makeResource() klass = self._getTargetClass() table = klass.from_api_repr(RESOURCE, dataset) - self.assertTrue(table._dataset._client is client) + self.assertIs(table._dataset._client, client) self._verifyResourceProperties(table, RESOURCE) def test_create_no_view_query_no_schema(self): @@ -1507,7 +1507,7 @@ def _upload_from_file_helper(self, **kw): job = table.upload_from_file( file_obj, 'CSV', rewind=True, **kw) - self.assertTrue(job is expected_job) + self.assertIs(job, expected_job) return conn.http._requested, PATH, BODY def test_upload_from_file_w_bound_client_multipart(self): diff --git a/unit_tests/bigtable/test_client.py b/unit_tests/bigtable/test_client.py index 5874bf3089dc..61d029db509c 100644 --- a/unit_tests/bigtable/test_client.py +++ b/unit_tests/bigtable/test_client.py @@ -316,7 +316,7 @@ def _constructor_test_helper(self, expected_scopes, creds, self.assertSequenceEqual(mock_make_table_stub.calls, []) expected_creds = expected_creds or creds - self.assertTrue(client._credentials is expected_creds) + self.assertIs(client._credentials, expected_creds) if expected_scopes is not None: self.assertEqual(client._credentials.scopes, expected_scopes) @@ -446,7 +446,7 @@ def test_credentials_getter(self): project = 'PROJECT' client = self._makeOneWithMocks(project=project, credentials=credentials) - self.assertTrue(client.credentials is credentials) + self.assertIs(client.credentials, credentials) def test_project_name_property(self): credentials = _Credentials() @@ -523,7 +523,7 @@ def test_instance_factory_defaults(self): self.assertEqual(instance._cluster_location_id, _EXISTING_INSTANCE_LOCATION_ID) self.assertEqual(instance._cluster_serve_nodes, DEFAULT_SERVE_NODES) - self.assertTrue(instance._client is client) + self.assertIs(instance._client, client) def test_instance_factory_w_explicit_serve_nodes(self): from google.cloud.bigtable.instance import Instance @@ -546,7 +546,7 @@ def test_instance_factory_w_explicit_serve_nodes(self): self.assertEqual(instance.display_name, DISPLAY_NAME) self.assertEqual(instance._cluster_location_id, LOCATION_ID) self.assertEqual(instance._cluster_serve_nodes, SERVE_NODES) - self.assertTrue(instance._client is client) + self.assertIs(instance._client, client) def test_list_instances(self): from google.cloud.bigtable._generated import ( diff --git a/unit_tests/bigtable/test_cluster.py b/unit_tests/bigtable/test_cluster.py index 0b8bc77632df..0587113eb39a 100644 --- a/unit_tests/bigtable/test_cluster.py +++ b/unit_tests/bigtable/test_cluster.py @@ -39,7 +39,7 @@ def test_constructor_defaults(self): cluster = self._makeOne(self.CLUSTER_ID, instance) self.assertEqual(cluster.cluster_id, self.CLUSTER_ID) - self.assertTrue(cluster._instance is instance) + self.assertIs(cluster._instance, instance) self.assertEqual(cluster.serve_nodes, DEFAULT_SERVE_NODES) def test_constructor_non_default(self): @@ -50,7 +50,7 @@ def test_constructor_non_default(self): cluster = self._makeOne(self.CLUSTER_ID, instance, serve_nodes=SERVE_NODES) self.assertEqual(cluster.cluster_id, self.CLUSTER_ID) - self.assertTrue(cluster._instance is instance) + self.assertIs(cluster._instance, instance) self.assertEqual(cluster.serve_nodes, SERVE_NODES) def test_copy(self): @@ -110,7 +110,7 @@ def test_from_pb_success(self): klass = self._getTargetClass() cluster = klass.from_pb(cluster_pb, instance) self.assertIsInstance(cluster, klass) - self.assertTrue(cluster._instance is instance) + self.assertIs(cluster._instance, instance) self.assertEqual(cluster.cluster_id, self.CLUSTER_ID) self.assertEqual(cluster.serve_nodes, SERVE_NODES) @@ -255,8 +255,8 @@ def test_create(self): self.assertIsInstance(result, Operation) self.assertEqual(result.name, OP_NAME) - self.assertTrue(result.target is cluster) - self.assertTrue(result.client is client) + self.assertIs(result.target, cluster) + self.assertIs(result.client, client) self.assertIsNone(result.pb_metadata) self.assertEqual(result.metadata, {'request_type': 'CreateCluster'}) @@ -321,8 +321,8 @@ def test_update(self): self.assertIsInstance(result, Operation) self.assertEqual(result.name, OP_NAME) - self.assertTrue(result.target is cluster) - self.assertTrue(result.client is client) + self.assertIs(result.target, cluster) + self.assertIs(result.client, client) self.assertIsInstance(result.pb_metadata, messages_v2_pb2.UpdateClusterMetadata) self.assertEqual(result.pb_metadata.request_time, NOW_PB) diff --git a/unit_tests/bigtable/test_column_family.py b/unit_tests/bigtable/test_column_family.py index 57941a6031ce..c8d8fde1104e 100644 --- a/unit_tests/bigtable/test_column_family.py +++ b/unit_tests/bigtable/test_column_family.py @@ -167,7 +167,7 @@ def _makeOne(self, *args, **kwargs): def test_constructor(self): rules = object() rule_union = self._makeOne(rules) - self.assertTrue(rule_union.rules is rules) + self.assertIs(rule_union.rules, rules) def test___eq__(self): rules = object() @@ -253,7 +253,7 @@ def _makeOne(self, *args, **kwargs): def test_constructor(self): rules = object() rule_intersection = self._makeOne(rules) - self.assertTrue(rule_intersection.rules is rules) + self.assertIs(rule_intersection.rules, rules) def test___eq__(self): rules = object() @@ -347,8 +347,8 @@ def test_constructor(self): column_family_id, table, gc_rule=gc_rule) self.assertEqual(column_family.column_family_id, column_family_id) - self.assertTrue(column_family._table is table) - self.assertTrue(column_family.gc_rule is gc_rule) + self.assertIs(column_family._table, table) + self.assertIs(column_family.gc_rule, gc_rule) def test_name_property(self): column_family_id = u'column-family-id' diff --git a/unit_tests/bigtable/test_instance.py b/unit_tests/bigtable/test_instance.py index 6257bbc00fe9..5a65292a0ad7 100644 --- a/unit_tests/bigtable/test_instance.py +++ b/unit_tests/bigtable/test_instance.py @@ -44,7 +44,7 @@ def test_constructor_defaults(self): instance = self._makeOne(self.INSTANCE_ID, client, self.LOCATION_ID) self.assertEqual(instance.instance_id, self.INSTANCE_ID) self.assertEqual(instance.display_name, self.INSTANCE_ID) - self.assertTrue(instance._client is client) + self.assertIs(instance._client, client) self.assertEqual(instance._cluster_location_id, self.LOCATION_ID) self.assertEqual(instance._cluster_serve_nodes, DEFAULT_SERVE_NODES) @@ -56,7 +56,7 @@ def test_constructor_non_default(self): display_name=display_name) self.assertEqual(instance.instance_id, self.INSTANCE_ID) self.assertEqual(instance.display_name, display_name) - self.assertTrue(instance._client is client) + self.assertIs(instance._client, client) def test_copy(self): display_name = 'display_name' @@ -263,8 +263,8 @@ def test_create(self): self.assertIsInstance(result, Operation) self.assertEqual(result.name, self.OP_NAME) - self.assertTrue(result.target is instance) - self.assertTrue(result.client is client) + self.assertIs(result.target, instance) + self.assertIs(result.client, client) self.assertIsInstance(result.pb_metadata, messages_v2_pb2.CreateInstanceMetadata) self.assertEqual(result.pb_metadata.request_time, NOW_PB) @@ -307,8 +307,8 @@ def test_create_w_explicit_serve_nodes(self): self.assertIsInstance(result, Operation) self.assertEqual(result.name, self.OP_NAME) - self.assertTrue(result.target is instance) - self.assertTrue(result.client is client) + self.assertIs(result.target, instance) + self.assertIs(result.client, client) self.assertEqual(len(stub.method_calls), 1) api_name, args, kwargs = stub.method_calls[0] diff --git a/unit_tests/bigtable/test_row.py b/unit_tests/bigtable/test_row.py index f1e846ca172f..864dc740fcac 100644 --- a/unit_tests/bigtable/test_row.py +++ b/unit_tests/bigtable/test_row.py @@ -46,7 +46,7 @@ def test_constructor(self): row = self._makeOne(row_key, table) self.assertEqual(row._row_key, row_key) - self.assertTrue(row._table is table) + self.assertIs(row._table, table) self.assertEqual(row._pb_mutations, []) def test_constructor_with_unicode(self): @@ -56,7 +56,7 @@ def test_constructor_with_unicode(self): row = self._makeOne(row_key, table) self.assertEqual(row._row_key, row_key_bytes) - self.assertTrue(row._table is table) + self.assertIs(row._table, table) def test_constructor_with_non_bytes(self): row_key = object() @@ -68,7 +68,7 @@ def test__get_mutations(self): row = self._makeOne(row_key, None) row._pb_mutations = mutations = object() - self.assertTrue(mutations is row._get_mutations(None)) + self.assertIs(mutations, row._get_mutations(None)) def _set_cell_helper(self, column=None, column_bytes=None, value=b'foobar', timestamp=None, @@ -390,8 +390,8 @@ def test_constructor(self): row = self._makeOne(row_key, table, filter_=filter_) self.assertEqual(row._row_key, row_key) - self.assertTrue(row._table is table) - self.assertTrue(row._filter is filter_) + self.assertIs(row._table, table) + self.assertIs(row._filter, filter_) self.assertEqual(row._true_pb_mutations, []) self.assertEqual(row._false_pb_mutations, []) @@ -402,9 +402,9 @@ def test__get_mutations(self): row._true_pb_mutations = true_mutations = object() row._false_pb_mutations = false_mutations = object() - self.assertTrue(true_mutations is row._get_mutations(True)) - self.assertTrue(false_mutations is row._get_mutations(False)) - self.assertTrue(false_mutations is row._get_mutations(None)) + self.assertIs(true_mutations, row._get_mutations(True)) + self.assertIs(false_mutations, row._get_mutations(False)) + self.assertIs(false_mutations, row._get_mutations(None)) def test_commit(self): from unit_tests.bigtable._testing import _FakeStub @@ -530,7 +530,7 @@ def test_constructor(self): row = self._makeOne(row_key, table) self.assertEqual(row._row_key, row_key) - self.assertTrue(row._table is table) + self.assertIs(row._table, table) self.assertEqual(row._rule_pb_list, []) def test_clear(self): diff --git a/unit_tests/bigtable/test_row_data.py b/unit_tests/bigtable/test_row_data.py index 25546511d4af..eef454e43c37 100644 --- a/unit_tests/bigtable/test_row_data.py +++ b/unit_tests/bigtable/test_row_data.py @@ -103,7 +103,7 @@ def _makeOne(self, *args, **kwargs): def test_constructor(self): row_key = object() partial_row_data = self._makeOne(row_key) - self.assertTrue(partial_row_data._row_key is row_key) + self.assertIs(partial_row_data._row_key, row_key) self.assertEqual(partial_row_data._cells, {}) def test___eq__(self): @@ -179,7 +179,7 @@ def test_cells_property(self): def test_row_key_getter(self): row_key = object() partial_row_data = self._makeOne(row_key) - self.assertTrue(partial_row_data.row_key is row_key) + self.assertIs(partial_row_data.row_key, row_key) class TestPartialRowsData(unittest.TestCase): @@ -252,7 +252,7 @@ def test_state_new_row_w_row(self): def test_rows_getter(self): partial_rows_data = self._makeOne(None) partial_rows_data._rows = value = object() - self.assertTrue(partial_rows_data.rows is value) + self.assertIs(partial_rows_data.rows, value) def test_cancel(self): response_iterator = _MockCancellableIterator() @@ -380,7 +380,7 @@ def test__save_row_no_cell(self): row = prd._row = _Dummy(row_key=ROW_KEY) prd._cell = None prd._save_current_row() - self.assertTrue(prd._rows[ROW_KEY] is row) + self.assertIs(prd._rows[ROW_KEY], row) def test_invalid_last_scanned_row_key_on_start(self): from google.cloud.bigtable.row_data import InvalidReadRowsResponse diff --git a/unit_tests/bigtable/test_row_filters.py b/unit_tests/bigtable/test_row_filters.py index 7ef28c070580..00c827fcaa8f 100644 --- a/unit_tests/bigtable/test_row_filters.py +++ b/unit_tests/bigtable/test_row_filters.py @@ -28,7 +28,7 @@ def _makeOne(self, *args, **kwargs): def test_constructor(self): flag = object() row_filter = self._makeOne(flag) - self.assertTrue(row_filter.flag is flag) + self.assertIs(row_filter.flag, flag) def test___eq__type_differ(self): flag = object() @@ -113,7 +113,7 @@ def _makeOne(self, *args, **kwargs): def test_constructor(self): regex = b'abc' row_filter = self._makeOne(regex) - self.assertTrue(row_filter.regex is regex) + self.assertIs(row_filter.regex, regex) def test_constructor_non_bytes(self): regex = u'abc' @@ -169,7 +169,7 @@ def _makeOne(self, *args, **kwargs): def test_constructor(self): sample = object() row_filter = self._makeOne(sample) - self.assertTrue(row_filter.sample is sample) + self.assertIs(row_filter.sample, sample) def test___eq__type_differ(self): sample = object() @@ -240,8 +240,8 @@ def test_constructor(self): start = object() end = object() time_range = self._makeOne(start=start, end=end) - self.assertTrue(time_range.start is start) - self.assertTrue(time_range.end is end) + self.assertIs(time_range.start, start) + self.assertIs(time_range.end, end) def test___eq__(self): start = object() @@ -313,7 +313,7 @@ def _makeOne(self, *args, **kwargs): def test_constructor(self): range_ = object() row_filter = self._makeOne(range_) - self.assertTrue(row_filter.range_ is range_) + self.assertIs(row_filter.range_, range_) def test___eq__type_differ(self): range_ = object() @@ -350,7 +350,7 @@ def _makeOne(self, *args, **kwargs): def test_constructor_defaults(self): column_family_id = object() row_filter = self._makeOne(column_family_id) - self.assertTrue(row_filter.column_family_id is column_family_id) + self.assertIs(row_filter.column_family_id, column_family_id) self.assertEqual(row_filter.start_column, None) self.assertEqual(row_filter.end_column, None) self.assertTrue(row_filter.inclusive_start) @@ -368,11 +368,11 @@ def test_constructor_explicit(self): end_column=end_column, inclusive_start=inclusive_start, inclusive_end=inclusive_end) - self.assertTrue(row_filter.column_family_id is column_family_id) - self.assertTrue(row_filter.start_column is start_column) - self.assertTrue(row_filter.end_column is end_column) - self.assertTrue(row_filter.inclusive_start is inclusive_start) - self.assertTrue(row_filter.inclusive_end is inclusive_end) + self.assertIs(row_filter.column_family_id, column_family_id) + self.assertIs(row_filter.start_column, start_column) + self.assertIs(row_filter.end_column, end_column) + self.assertIs(row_filter.inclusive_start, inclusive_start) + self.assertIs(row_filter.inclusive_end, inclusive_end) def test_constructor_bad_start(self): column_family_id = object() @@ -504,10 +504,10 @@ def test_constructor_explicit(self): end_value=end_value, inclusive_start=inclusive_start, inclusive_end=inclusive_end) - self.assertTrue(row_filter.start_value is start_value) - self.assertTrue(row_filter.end_value is end_value) - self.assertTrue(row_filter.inclusive_start is inclusive_start) - self.assertTrue(row_filter.inclusive_end is inclusive_end) + self.assertIs(row_filter.start_value, start_value) + self.assertIs(row_filter.end_value, end_value) + self.assertIs(row_filter.inclusive_start, inclusive_start) + self.assertIs(row_filter.inclusive_end, inclusive_end) def test_constructor_bad_start(self): self.assertRaises(ValueError, self._makeOne, inclusive_start=True) @@ -582,7 +582,7 @@ def _makeOne(self, *args, **kwargs): def test_constructor(self): num_cells = object() row_filter = self._makeOne(num_cells) - self.assertTrue(row_filter.num_cells is num_cells) + self.assertIs(row_filter.num_cells, num_cells) def test___eq__type_differ(self): num_cells = object() @@ -688,7 +688,7 @@ def _makeOne(self, *args, **kwargs): def test_constructor(self): label = object() row_filter = self._makeOne(label) - self.assertTrue(row_filter.label is label) + self.assertIs(row_filter.label, label) def test___eq__type_differ(self): label = object() @@ -726,7 +726,7 @@ def test_constructor_defaults(self): def test_constructor_explicit(self): filters = object() row_filter = self._makeOne(filters=filters) - self.assertTrue(row_filter.filters is filters) + self.assertIs(row_filter.filters, filters) def test___eq__(self): filters = object() @@ -869,9 +869,9 @@ def test_constructor(self): cond_filter = self._makeOne(base_filter, true_filter=true_filter, false_filter=false_filter) - self.assertTrue(cond_filter.base_filter is base_filter) - self.assertTrue(cond_filter.true_filter is true_filter) - self.assertTrue(cond_filter.false_filter is false_filter) + self.assertIs(cond_filter.base_filter, base_filter) + self.assertIs(cond_filter.true_filter, true_filter) + self.assertIs(cond_filter.false_filter, false_filter) def test___eq__(self): base_filter = object() diff --git a/unit_tests/bigtable/test_table.py b/unit_tests/bigtable/test_table.py index 58cb0a5d8044..a7d18fe630bc 100644 --- a/unit_tests/bigtable/test_table.py +++ b/unit_tests/bigtable/test_table.py @@ -42,7 +42,7 @@ def test_constructor(self): table = self._makeOne(table_id, instance) self.assertEqual(table.table_id, table_id) - self.assertTrue(table._instance is instance) + self.assertIs(table._instance, instance) def test_name_property(self): table_id = 'table-id' @@ -64,7 +64,7 @@ def test_column_family_factory(self): self.assertIsInstance(column_family, ColumnFamily) self.assertEqual(column_family.column_family_id, column_family_id) - self.assertTrue(column_family.gc_rule is gc_rule) + self.assertIs(column_family.gc_rule, gc_rule) self.assertEqual(column_family._table, table) def test_row_factory_direct(self): diff --git a/unit_tests/datastore/test_batch.py b/unit_tests/datastore/test_batch.py index 9854bb8cd0bc..a8999387ea40 100644 --- a/unit_tests/datastore/test_batch.py +++ b/unit_tests/datastore/test_batch.py @@ -40,7 +40,7 @@ def test_ctor(self): self.assertEqual(batch._status, batch._INITIAL) self.assertIsInstance(batch._commit_request, datastore_pb2.CommitRequest) - self.assertTrue(batch.mutations is batch._commit_request.mutations) + self.assertIs(batch.mutations, batch._commit_request.mutations) self.assertEqual(batch._partial_key_entities, []) def test_current(self): @@ -52,13 +52,13 @@ def test_current(self): self.assertIsNone(batch1.current()) self.assertIsNone(batch2.current()) with batch1: - self.assertTrue(batch1.current() is batch1) - self.assertTrue(batch2.current() is batch1) + self.assertIs(batch1.current(), batch1) + self.assertIs(batch2.current(), batch1) with batch2: - self.assertTrue(batch1.current() is batch2) - self.assertTrue(batch2.current() is batch2) - self.assertTrue(batch1.current() is batch1) - self.assertTrue(batch2.current() is batch1) + self.assertIs(batch1.current(), batch2) + self.assertIs(batch2.current(), batch2) + self.assertIs(batch1.current(), batch1) + self.assertIs(batch2.current(), batch1) self.assertIsNone(batch1.current()) self.assertIsNone(batch2.current()) diff --git a/unit_tests/datastore/test_client.py b/unit_tests/datastore/test_client.py index 250c829ce20e..95955b59e1b3 100644 --- a/unit_tests/datastore/test_client.py +++ b/unit_tests/datastore/test_client.py @@ -170,7 +170,7 @@ def fallback_mock(project): self.assertEqual(client.project, OTHER) self.assertEqual(client.namespace, None) self.assertIsInstance(client.connection, _MockConnection) - self.assertTrue(client.connection.credentials is creds) + self.assertIs(client.connection.credentials, creds) self.assertIsNone(client.connection.http) self.assertIsNone(client.current_batch) self.assertIsNone(client.current_transaction) @@ -188,8 +188,8 @@ def test_ctor_w_explicit_inputs(self): self.assertEqual(client.project, OTHER) self.assertEqual(client.namespace, NAMESPACE) self.assertIsInstance(client.connection, _MockConnection) - self.assertTrue(client.connection.credentials is creds) - self.assertTrue(client.connection.http is http) + self.assertIs(client.connection.credentials, creds) + self.assertIs(client.connection.http, http) self.assertIsNone(client.current_batch) self.assertEqual(list(client._batch_stack), []) @@ -200,16 +200,16 @@ def test__push_batch_and__pop_batch(self): xact = client.transaction() client._push_batch(batch) self.assertEqual(list(client._batch_stack), [batch]) - self.assertTrue(client.current_batch is batch) + self.assertIs(client.current_batch, batch) self.assertIsNone(client.current_transaction) client._push_batch(xact) - self.assertTrue(client.current_batch is xact) - self.assertTrue(client.current_transaction is xact) + self.assertIs(client.current_batch, xact) + self.assertIs(client.current_transaction, xact) # list(_LocalStack) returns in reverse order. self.assertEqual(list(client._batch_stack), [xact, batch]) - self.assertTrue(client._pop_batch() is xact) + self.assertIs(client._pop_batch(), xact) self.assertEqual(list(client._batch_stack), [batch]) - self.assertTrue(client._pop_batch() is batch) + self.assertIs(client._pop_batch(), batch) self.assertEqual(list(client._batch_stack), []) def test_get_miss(self): @@ -248,12 +248,12 @@ def _get_multi(*args, **kw): key, missing, deferred = object(), [], [] - self.assertTrue(client.get(key, missing, deferred, TXN_ID) is _entity) + self.assertIs(client.get(key, missing, deferred, TXN_ID), _entity) self.assertEqual(_called_with[0][0], ()) self.assertEqual(_called_with[0][1]['keys'], [key]) - self.assertTrue(_called_with[0][1]['missing'] is missing) - self.assertTrue(_called_with[0][1]['deferred'] is deferred) + self.assertIs(_called_with[0][1]['missing'], missing) + self.assertIs(_called_with[0][1]['deferred'], deferred) self.assertEqual(_called_with[0][1]['transaction'], TXN_ID) def test_get_multi_no_keys(self): diff --git a/unit_tests/datastore/test_connection.py b/unit_tests/datastore/test_connection.py index 7dcb9d22be80..070b19437eeb 100644 --- a/unit_tests/datastore/test_connection.py +++ b/unit_tests/datastore/test_connection.py @@ -397,12 +397,12 @@ def create_scoped_required(self): creds = Creds() conn = self._makeOne(creds) - self.assertTrue(conn.credentials is creds) + self.assertIs(conn.credentials, creds) def test_http_w_existing(self): conn = self._makeOne() conn._http = http = object() - self.assertTrue(conn.http is http) + self.assertIs(conn.http, http) def test_http_wo_creds(self): import httplib2 @@ -426,7 +426,7 @@ def create_scoped_required(self): creds = Creds() conn = self._makeOne(creds) - self.assertTrue(conn.http is authorized) + self.assertIs(conn.http, authorized) self.assertIsInstance(creds._called_with, httplib2.Http) def test_build_api_url_w_default_base_version(self): @@ -900,7 +900,7 @@ def mock_parse(response): with _Monkey(MUT, _parse_commit_response=mock_parse): result = conn.commit(PROJECT, req_pb, None) - self.assertTrue(result is expected_result) + self.assertIs(result, expected_result) cw = http._called_with self._verifyProtobufCall(cw, URI, conn) rq_class = datastore_pb2.CommitRequest @@ -946,7 +946,7 @@ def mock_parse(response): with _Monkey(MUT, _parse_commit_response=mock_parse): result = conn.commit(PROJECT, req_pb, b'xact') - self.assertTrue(result is expected_result) + self.assertIs(result, expected_result) cw = http._called_with self._verifyProtobufCall(cw, URI, conn) rq_class = datastore_pb2.CommitRequest diff --git a/unit_tests/datastore/test_helpers.py b/unit_tests/datastore/test_helpers.py index 1d3c818c726e..3d3783375b11 100644 --- a/unit_tests/datastore/test_helpers.py +++ b/unit_tests/datastore/test_helpers.py @@ -507,13 +507,13 @@ def test_entity(self): entity = Entity() name, value = self._callFUT(entity) self.assertEqual(name, 'entity_value') - self.assertTrue(value is entity) + self.assertIs(value, entity) def test_array(self): values = ['a', 0, 3.14] name, value = self._callFUT(values) self.assertEqual(name, 'array_value') - self.assertTrue(value is values) + self.assertIs(value, values) def test_geo_point(self): from google.type import latlng_pb2 diff --git a/unit_tests/datastore/test_key.py b/unit_tests/datastore/test_key.py index f5a70c25b77e..36352a3aa4f1 100644 --- a/unit_tests/datastore/test_key.py +++ b/unit_tests/datastore/test_key.py @@ -56,7 +56,7 @@ def test_ctor_parent(self): self.assertEqual(key.namespace, parent_key.namespace) self.assertEqual(key.kind, _CHILD_KIND) self.assertEqual(key.path, _PATH) - self.assertTrue(key.parent is parent_key) + self.assertIs(key.parent, parent_key) def test_ctor_partial_parent(self): parent_key = self._makeOne('KIND', project=self._DEFAULT_PROJECT) @@ -138,9 +138,9 @@ def test__clone_with_parent(self): parent = self._makeOne(_KIND1, _ID1, namespace=_NAMESPACE, project=_PROJECT) key = self._makeOne(_KIND2, _ID2, parent=parent) - self.assertTrue(key.parent is parent) + self.assertIs(key.parent, parent) clone = key._clone() - self.assertTrue(clone.parent is key.parent) + self.assertIs(clone.parent, key.parent) self.assertEqual(clone.project, _PROJECT) self.assertEqual(clone.namespace, _NAMESPACE) self.assertEqual(clone.path, _PATH) @@ -428,4 +428,4 @@ def test_parent_multiple_calls(self): parent = key.parent self.assertEqual(parent.path, _PARENT_PATH) new_parent = key.parent - self.assertTrue(parent is new_parent) + self.assertIs(parent, new_parent) diff --git a/unit_tests/datastore/test_query.py b/unit_tests/datastore/test_query.py index 073be3675145..cfd41419483a 100644 --- a/unit_tests/datastore/test_query.py +++ b/unit_tests/datastore/test_query.py @@ -34,7 +34,7 @@ def _makeClient(self, connection=None): def test_ctor_defaults(self): client = self._makeClient() query = self._makeOne(client) - self.assertTrue(query._client is client) + self.assertIs(query._client, client) self.assertEqual(query.project, client.project) self.assertEqual(query.kind, None) self.assertEqual(query.namespace, client.namespace) @@ -66,7 +66,7 @@ def test_ctor_explicit(self): order=ORDER, distinct_on=DISTINCT_ON, ) - self.assertTrue(query._client is client) + self.assertIs(query._client, client) self.assertEqual(query.project, _PROJECT) self.assertEqual(query.kind, _KIND) self.assertEqual(query.namespace, _NAMESPACE) @@ -313,8 +313,8 @@ def test_fetch_defaults_w_client_attr(self): client = self._makeClient(connection) query = self._makeOne(client) iterator = query.fetch() - self.assertTrue(iterator._query is query) - self.assertTrue(iterator._client is client) + self.assertIs(iterator._query, query) + self.assertIs(iterator._client, client) self.assertEqual(iterator._limit, None) self.assertEqual(iterator._offset, 0) @@ -324,8 +324,8 @@ def test_fetch_w_explicit_client(self): other_client = self._makeClient(connection) query = self._makeOne(client) iterator = query.fetch(limit=7, offset=8, client=other_client) - self.assertTrue(iterator._query is query) - self.assertTrue(iterator._client is other_client) + self.assertIs(iterator._query, query) + self.assertIs(iterator._client, other_client) self.assertEqual(iterator._limit, 7) self.assertEqual(iterator._offset, 8) @@ -380,7 +380,7 @@ def test_ctor_defaults(self): connection = _Connection() query = object() iterator = self._makeOne(query, connection) - self.assertTrue(iterator._query is query) + self.assertIs(iterator._query, query) self.assertEqual(iterator._limit, None) self.assertEqual(iterator._offset, None) self.assertEqual(iterator._skipped_results, None) @@ -389,7 +389,7 @@ def test_ctor_explicit(self): client = self._makeClient() query = _Query(client) iterator = self._makeOne(query, client, 13, 29) - self.assertTrue(iterator._query is query) + self.assertIs(iterator._query, query) self.assertEqual(iterator._limit, 13) self.assertEqual(iterator._offset, 29) diff --git a/unit_tests/datastore/test_transaction.py b/unit_tests/datastore/test_transaction.py index 0b917e468ce7..73e3ed3faee9 100644 --- a/unit_tests/datastore/test_transaction.py +++ b/unit_tests/datastore/test_transaction.py @@ -37,7 +37,7 @@ def test_ctor_defaults(self): self.assertEqual(xact._status, self._getTargetClass()._INITIAL) self.assertIsInstance(xact._commit_request, datastore_pb2.CommitRequest) - self.assertTrue(xact.mutations is xact._commit_request.mutations) + self.assertIs(xact.mutations, xact._commit_request.mutations) self.assertEqual(len(xact._partial_key_entities), 0) def test_current(self): @@ -49,19 +49,19 @@ def test_current(self): self.assertIsNone(xact1.current()) self.assertIsNone(xact2.current()) with xact1: - self.assertTrue(xact1.current() is xact1) - self.assertTrue(xact2.current() is xact1) + self.assertIs(xact1.current(), xact1) + self.assertIs(xact2.current(), xact1) with _NoCommitBatch(client): self.assertIsNone(xact1.current()) self.assertIsNone(xact2.current()) with xact2: - self.assertTrue(xact1.current() is xact2) - self.assertTrue(xact2.current() is xact2) + self.assertIs(xact1.current(), xact2) + self.assertIs(xact2.current(), xact2) with _NoCommitBatch(client): self.assertIsNone(xact1.current()) self.assertIsNone(xact2.current()) - self.assertTrue(xact1.current() is xact1) - self.assertTrue(xact2.current() is xact1) + self.assertIs(xact1.current(), xact1) + self.assertIs(xact2.current(), xact1) self.assertIsNone(xact1.current()) self.assertIsNone(xact2.current()) diff --git a/unit_tests/dns/test_changes.py b/unit_tests/dns/test_changes.py index 0fa5d6a9f8d1..cd53f26238a6 100644 --- a/unit_tests/dns/test_changes.py +++ b/unit_tests/dns/test_changes.py @@ -68,7 +68,7 @@ def _verifyResourceProperties(self, changes, resource, zone): self.assertEqual(found.record_type, expected['type']) self.assertEqual(found.ttl, int(expected['ttl'])) self.assertEqual(found.rrdatas, expected['rrdatas']) - self.assertTrue(found.zone is zone) + self.assertIs(found.zone, zone) r_deletions = resource.get('deletions', ()) self.assertEqual(len(changes.deletions), len(r_deletions)) @@ -77,14 +77,14 @@ def _verifyResourceProperties(self, changes, resource, zone): self.assertEqual(found.record_type, expected['type']) self.assertEqual(found.ttl, int(expected['ttl'])) self.assertEqual(found.rrdatas, expected['rrdatas']) - self.assertTrue(found.zone is zone) + self.assertIs(found.zone, zone) def test_ctor(self): zone = _Zone() changes = self._makeOne(zone) - self.assertTrue(changes.zone is zone) + self.assertIs(changes.zone, zone) self.assertEqual(changes.name, None) self.assertEqual(changes.status, None) self.assertEqual(changes.started, None) diff --git a/unit_tests/dns/test_client.py b/unit_tests/dns/test_client.py index 2e1dc97d6acf..112dbca2ff6d 100644 --- a/unit_tests/dns/test_client.py +++ b/unit_tests/dns/test_client.py @@ -34,8 +34,8 @@ def test_ctor(self): client = self._makeOne(project=self.PROJECT, credentials=creds, http=http) self.assertIsInstance(client.connection, Connection) - self.assertTrue(client.connection.credentials is creds) - self.assertTrue(client.connection.http is http) + self.assertIs(client.connection.credentials, creds) + self.assertIs(client.connection.http, http) def test_quotas_defaults(self): PATH = 'projects/%s' % (self.PROJECT,) @@ -201,7 +201,7 @@ def test_zone_explicit(self): self.assertEqual(zone.name, self.ZONE_NAME) self.assertEqual(zone.dns_name, DNS_NAME) self.assertEqual(zone.description, DESCRIPTION) - self.assertTrue(zone._client is client) + self.assertIs(zone._client, client) def test_zone_w_dns_name_wo_description(self): from google.cloud.dns.zone import ManagedZone @@ -213,7 +213,7 @@ def test_zone_w_dns_name_wo_description(self): self.assertEqual(zone.name, self.ZONE_NAME) self.assertEqual(zone.dns_name, DNS_NAME) self.assertEqual(zone.description, DNS_NAME) - self.assertTrue(zone._client is client) + self.assertIs(zone._client, client) def test_zone_wo_dns_name(self): from google.cloud.dns.zone import ManagedZone @@ -224,7 +224,7 @@ def test_zone_wo_dns_name(self): self.assertEqual(zone.name, self.ZONE_NAME) self.assertEqual(zone.dns_name, None) self.assertEqual(zone.description, None) - self.assertTrue(zone._client is client) + self.assertIs(zone._client, client) class _Credentials(object): diff --git a/unit_tests/dns/test_resource_record_set.py b/unit_tests/dns/test_resource_record_set.py index 9ced4ad5e783..2adf35312d31 100644 --- a/unit_tests/dns/test_resource_record_set.py +++ b/unit_tests/dns/test_resource_record_set.py @@ -34,7 +34,7 @@ def test_ctor(self): self.assertEqual(rrs.record_type, 'CNAME') self.assertEqual(rrs.ttl, 3600) self.assertEqual(rrs.rrdatas, ['www.example.com']) - self.assertTrue(rrs.zone is zone) + self.assertIs(rrs.zone, zone) def test_from_api_repr_missing_rrdatas(self): zone = _Zone() @@ -87,7 +87,7 @@ def test_from_api_repr_bare(self): self.assertEqual(rrs.record_type, 'CNAME') self.assertEqual(rrs.ttl, 3600) self.assertEqual(rrs.rrdatas, ['www.example.com']) - self.assertTrue(rrs.zone is zone) + self.assertIs(rrs.zone, zone) class _Zone(object): diff --git a/unit_tests/dns/test_zone.py b/unit_tests/dns/test_zone.py index 20ae11a7ae37..0251122aaf84 100644 --- a/unit_tests/dns/test_zone.py +++ b/unit_tests/dns/test_zone.py @@ -105,7 +105,7 @@ def test_ctor_wo_description(self): zone = self._makeOne(self.ZONE_NAME, self.DNS_NAME, client) self.assertEqual(zone.name, self.ZONE_NAME) self.assertEqual(zone.dns_name, self.DNS_NAME) - self.assertTrue(zone._client is client) + self.assertIs(zone._client, client) self.assertEqual(zone.project, client.project) self.assertEqual( zone.path, @@ -121,7 +121,7 @@ def test_ctor_explicit(self): self.ZONE_NAME, self.DNS_NAME, client, DESCRIPTION) self.assertEqual(zone.name, self.ZONE_NAME) self.assertEqual(zone.dns_name, self.DNS_NAME) - self.assertTrue(zone._client is client) + self.assertIs(zone._client, client) self.assertEqual(zone.project, client.project) self.assertEqual( zone.path, @@ -147,7 +147,7 @@ def test_from_api_repr_bare(self): } klass = self._getTargetClass() zone = klass.from_api_repr(RESOURCE, client=client) - self.assertTrue(zone._client is client) + self.assertIs(zone._client, client) self._verifyResourceProperties(zone, RESOURCE) def test_from_api_repr_w_properties(self): @@ -156,7 +156,7 @@ def test_from_api_repr_w_properties(self): RESOURCE = self._makeResource() klass = self._getTargetClass() zone = klass.from_api_repr(RESOURCE, client=client) - self.assertTrue(zone._client is client) + self.assertIs(zone._client, client) self._verifyResourceProperties(zone, RESOURCE) def test_description_setter_bad_value(self): @@ -197,7 +197,7 @@ def test_resource_record_set(self): self.assertEqual(rrs.record_type, RRS_TYPE) self.assertEqual(rrs.ttl, TTL) self.assertEqual(rrs.rrdatas, RRDATAS) - self.assertTrue(rrs.zone is zone) + self.assertIs(rrs.zone, zone) def test_changes(self): from google.cloud.dns.changes import Changes @@ -205,7 +205,7 @@ def test_changes(self): zone = self._makeOne(self.ZONE_NAME, self.DNS_NAME, client) changes = zone.changes() self.assertIsInstance(changes, Changes) - self.assertTrue(changes.zone is zone) + self.assertIs(changes.zone, zone) def test_create_w_bound_client(self): PATH = 'projects/%s/managedZones' % self.PROJECT diff --git a/unit_tests/language/test_client.py b/unit_tests/language/test_client.py index ff357772887a..a502fce1ea9d 100644 --- a/unit_tests/language/test_client.py +++ b/unit_tests/language/test_client.py @@ -31,8 +31,8 @@ def test_ctor(self): http = object() client = self._makeOne(credentials=creds, http=http) self.assertIsInstance(client.connection, Connection) - self.assertTrue(client.connection.credentials is creds) - self.assertTrue(client.connection.http is http) + self.assertIs(client.connection.credentials, creds) + self.assertIs(client.connection.http, http) def test_document_from_text_factory(self): from google.cloud.language.document import Document diff --git a/unit_tests/logging/test__gax.py b/unit_tests/logging/test__gax.py index 1d541a931778..daf7f1672179 100644 --- a/unit_tests/logging/test__gax.py +++ b/unit_tests/logging/test__gax.py @@ -47,7 +47,7 @@ def _getTargetClass(self): def test_ctor(self): gax_api = _GAXLoggingAPI() api = self._makeOne(gax_api) - self.assertTrue(api._gax_api is gax_api) + self.assertIs(api._gax_api, gax_api) def test_list_entries_no_paging(self): from google.gax import INITIAL_PAGE @@ -78,7 +78,7 @@ def test_list_entries_no_paging(self): self.assertEqual(filter_, self.FILTER) self.assertEqual(order_by, DESCENDING) self.assertEqual(page_size, 0) - self.assertTrue(options.page_token is INITIAL_PAGE) + self.assertIs(options.page_token, INITIAL_PAGE) def test_list_entries_with_paging(self): from google.protobuf.struct_pb2 import Value @@ -450,7 +450,7 @@ def _getTargetClass(self): def test_ctor(self): gax_api = _GAXSinksAPI() api = self._makeOne(gax_api) - self.assertTrue(api._gax_api is gax_api) + self.assertIs(api._gax_api, gax_api) def test_list_sinks_no_paging(self): from google.gax import INITIAL_PAGE @@ -658,7 +658,7 @@ def _getTargetClass(self): def test_ctor(self): gax_api = _GAXMetricsAPI() api = self._makeOne(gax_api) - self.assertTrue(api._gax_api is gax_api) + self.assertIs(api._gax_api, gax_api) def test_list_metrics_no_paging(self): from google.gax import INITIAL_PAGE @@ -876,9 +876,9 @@ def test_w_string_value(self): def test_w_bool_values(self): from google.protobuf.struct_pb2 import Value true_value_pb = Value(bool_value=True) - self.assertTrue(self._callFUT(true_value_pb) is True) + self.assertIs(self._callFUT(true_value_pb), True) false_value_pb = Value(bool_value=False) - self.assertTrue(self._callFUT(false_value_pb) is False) + self.assertIs(self._callFUT(false_value_pb), False) def test_w_number_values(self): from google.protobuf.struct_pb2 import Value diff --git a/unit_tests/logging/test_client.py b/unit_tests/logging/test_client.py index 9c71a2748198..63749960fb67 100644 --- a/unit_tests/logging/test_client.py +++ b/unit_tests/logging/test_client.py @@ -49,10 +49,10 @@ def test_logging_api_wo_gax(self): api = client.logging_api self.assertIsInstance(api, _LoggingAPI) - self.assertTrue(api._connection is conn) + self.assertIs(api._connection, conn) # API instance is cached again = client.logging_api - self.assertTrue(again is api) + self.assertIs(again, api) def test_logging_api_w_gax(self): from google.cloud.logging import client as MUT @@ -80,10 +80,10 @@ def __init__(self, _wrapped): api = client.logging_api self.assertIsInstance(api, _GaxLoggingAPI) - self.assertTrue(api._wrapped is wrapped) + self.assertIs(api._wrapped, wrapped) # API instance is cached again = client.logging_api - self.assertTrue(again is api) + self.assertIs(again, api) def test_sinks_api_wo_gax(self): from google.cloud.logging.connection import _SinksAPI @@ -96,10 +96,10 @@ def test_sinks_api_wo_gax(self): api = client.sinks_api self.assertIsInstance(api, _SinksAPI) - self.assertTrue(api._connection is conn) + self.assertIs(api._connection, conn) # API instance is cached again = client.sinks_api - self.assertTrue(again is api) + self.assertIs(again, api) def test_sinks_api_w_gax(self): from google.cloud.logging import client as MUT @@ -127,10 +127,10 @@ def __init__(self, _wrapped): api = client.sinks_api self.assertIsInstance(api, _GaxSinksAPI) - self.assertTrue(api._wrapped is wrapped) + self.assertIs(api._wrapped, wrapped) # API instance is cached again = client.sinks_api - self.assertTrue(again is api) + self.assertIs(again, api) def test_metrics_api_wo_gax(self): from google.cloud.logging.connection import _MetricsAPI @@ -143,10 +143,10 @@ def test_metrics_api_wo_gax(self): api = client.metrics_api self.assertIsInstance(api, _MetricsAPI) - self.assertTrue(api._connection is conn) + self.assertIs(api._connection, conn) # API instance is cached again = client.metrics_api - self.assertTrue(again is api) + self.assertIs(again, api) def test_metrics_api_w_gax(self): from google.cloud.logging import client as MUT @@ -174,10 +174,10 @@ def __init__(self, _wrapped): api = client.metrics_api self.assertIsInstance(api, _GaxMetricsAPI) - self.assertTrue(api._wrapped is wrapped) + self.assertIs(api._wrapped, wrapped) # API instance is cached again = client.metrics_api - self.assertTrue(again is api) + self.assertIs(again, api) def test_logger(self): from google.cloud.logging.logger import Logger @@ -186,7 +186,7 @@ def test_logger(self): logger = client.logger(self.LOGGER_NAME) self.assertIsInstance(logger, Logger) self.assertEqual(logger.name, self.LOGGER_NAME) - self.assertTrue(logger.client is client) + self.assertIs(logger.client, client) self.assertEqual(logger.project, self.PROJECT) def test__entry_from_resource_unknown_type(self): @@ -225,7 +225,7 @@ def test_list_entries_defaults(self): self.assertEqual(entry.payload, TEXT) logger = entry.logger self.assertEqual(logger.name, self.LOGGER_NAME) - self.assertTrue(logger.client is client) + self.assertIs(logger.client, client) self.assertEqual(logger.project, self.PROJECT) self.assertEqual(token, TOKEN) @@ -282,7 +282,7 @@ def test_list_entries_explicit(self): logger = entry.logger self.assertIsInstance(logger, Logger) self.assertEqual(logger.name, self.LOGGER_NAME) - self.assertTrue(logger.client is client) + self.assertIs(logger.client, client) self.assertEqual(logger.project, self.PROJECT) entry = entries[1] @@ -291,10 +291,10 @@ def test_list_entries_explicit(self): self.assertEqual(entry.payload, PROTO_PAYLOAD) logger = entry.logger self.assertEqual(logger.name, self.LOGGER_NAME) - self.assertTrue(logger.client is client) + self.assertIs(logger.client, client) self.assertEqual(logger.project, self.PROJECT) - self.assertTrue(entries[0].logger is entries[1].logger) + self.assertIs(entries[0].logger, entries[1].logger) self.assertEqual(token, None) self.assertEqual( @@ -310,7 +310,7 @@ def test_sink_defaults(self): self.assertEqual(sink.name, self.SINK_NAME) self.assertEqual(sink.filter_, None) self.assertEqual(sink.destination, None) - self.assertTrue(sink.client is client) + self.assertIs(sink.client, client) self.assertEqual(sink.project, self.PROJECT) def test_sink_explicit(self): @@ -322,7 +322,7 @@ def test_sink_explicit(self): self.assertEqual(sink.name, self.SINK_NAME) self.assertEqual(sink.filter_, self.FILTER) self.assertEqual(sink.destination, self.DESTINATION_URI) - self.assertTrue(sink.client is client) + self.assertIs(sink.client, client) self.assertEqual(sink.project, self.PROJECT) def test_list_sinks_no_paging(self): @@ -391,7 +391,7 @@ def test_metric_defaults(self): self.assertEqual(metric.name, self.METRIC_NAME) self.assertEqual(metric.filter_, None) self.assertEqual(metric.description, '') - self.assertTrue(metric.client is client_obj) + self.assertIs(metric.client, client_obj) self.assertEqual(metric.project, self.PROJECT) def test_metric_explicit(self): @@ -405,7 +405,7 @@ def test_metric_explicit(self): self.assertEqual(metric.name, self.METRIC_NAME) self.assertEqual(metric.filter_, self.FILTER) self.assertEqual(metric.description, self.DESCRIPTION) - self.assertTrue(metric.client is client_obj) + self.assertIs(metric.client, client_obj) self.assertEqual(metric.project, self.PROJECT) def test_list_metrics_no_paging(self): diff --git a/unit_tests/logging/test_connection.py b/unit_tests/logging/test_connection.py index ed8c14c42a07..436f01b1d21d 100644 --- a/unit_tests/logging/test_connection.py +++ b/unit_tests/logging/test_connection.py @@ -52,7 +52,7 @@ def _makeOne(self, *args, **kw): def test_ctor(self): connection = object() api = self._makeOne(connection) - self.assertTrue(api._connection is connection) + self.assertIs(api._connection, connection) @staticmethod def _make_timestamp(): @@ -237,7 +237,7 @@ def _makeOne(self, *args, **kw): def test_ctor(self): connection = object() api = self._makeOne(connection) - self.assertTrue(api._connection is connection) + self.assertIs(api._connection, connection) def test_list_sinks_no_paging(self): TOKEN = 'TOKEN' diff --git a/unit_tests/logging/test_entries.py b/unit_tests/logging/test_entries.py index e548136c0f05..1cbd22c83769 100644 --- a/unit_tests/logging/test_entries.py +++ b/unit_tests/logging/test_entries.py @@ -57,7 +57,7 @@ def test_ctor_defaults(self): logger = _Logger(self.LOGGER_NAME, self.PROJECT) entry = self._makeOne(PAYLOAD, logger) self.assertEqual(entry.payload, PAYLOAD) - self.assertTrue(entry.logger is logger) + self.assertIs(entry.logger, logger) self.assertIsNone(entry.insert_id) self.assertIsNone(entry.timestamp) self.assertIsNone(entry.labels) @@ -87,7 +87,7 @@ def test_ctor_explicit(self): severity=SEVERITY, http_request=REQUEST) self.assertEqual(entry.payload, PAYLOAD) - self.assertTrue(entry.logger is logger) + self.assertIs(entry.logger, logger) self.assertEqual(entry.insert_id, IID) self.assertEqual(entry.timestamp, TIMESTAMP) self.assertEqual(entry.labels, LABELS) @@ -113,7 +113,7 @@ def test_from_api_repr_missing_data_no_loggers(self): self.assertIsNone(entry.http_request) logger = entry.logger self.assertIsInstance(logger, _Logger) - self.assertTrue(logger.client is client) + self.assertIs(logger.client, client) self.assertEqual(logger.name, self.LOGGER_NAME) def test_from_api_repr_w_loggers_no_logger_match(self): @@ -156,7 +156,7 @@ def test_from_api_repr_w_loggers_no_logger_match(self): self.assertEqual(entry.http_request['status'], STATUS) logger = entry.logger self.assertIsInstance(logger, _Logger) - self.assertTrue(logger.client is client) + self.assertIs(logger.client, client) self.assertEqual(logger.name, self.LOGGER_NAME) self.assertEqual(loggers, {LOG_NAME: logger}) @@ -185,7 +185,7 @@ def test_from_api_repr_w_loggers_w_logger_match(self): self.assertEqual(entry.insert_id, IID) self.assertEqual(entry.timestamp, NOW) self.assertEqual(entry.labels, LABELS) - self.assertTrue(entry.logger is LOGGER) + self.assertIs(entry.logger, LOGGER) class TestProtobufEntry(unittest.TestCase): diff --git a/unit_tests/logging/test_logger.py b/unit_tests/logging/test_logger.py index cc58cb7bb171..0cb541b3575e 100644 --- a/unit_tests/logging/test_logger.py +++ b/unit_tests/logging/test_logger.py @@ -32,7 +32,7 @@ def test_ctor_defaults(self): client = _Client(self.PROJECT, conn) logger = self._makeOne(self.LOGGER_NAME, client=client) self.assertEqual(logger.name, self.LOGGER_NAME) - self.assertTrue(logger.client is client) + self.assertIs(logger.client, client) self.assertEqual(logger.project, self.PROJECT) self.assertEqual(logger.full_name, 'projects/%s/logs/%s' % (self.PROJECT, self.LOGGER_NAME)) @@ -46,7 +46,7 @@ def test_ctor_explicit(self): client = _Client(self.PROJECT, conn) logger = self._makeOne(self.LOGGER_NAME, client=client, labels=LABELS) self.assertEqual(logger.name, self.LOGGER_NAME) - self.assertTrue(logger.client is client) + self.assertIs(logger.client, client) self.assertEqual(logger.project, self.PROJECT) self.assertEqual(logger.full_name, 'projects/%s/logs/%s' % (self.PROJECT, self.LOGGER_NAME)) @@ -61,8 +61,8 @@ def test_batch_w_bound_client(self): logger = self._makeOne(self.LOGGER_NAME, client=client) batch = logger.batch() self.assertIsInstance(batch, Batch) - self.assertTrue(batch.logger is logger) - self.assertTrue(batch.client is client) + self.assertIs(batch.logger, logger) + self.assertIs(batch.client, client) def test_batch_w_alternate_client(self): from google.cloud.logging.logger import Batch @@ -73,8 +73,8 @@ def test_batch_w_alternate_client(self): logger = self._makeOne(self.LOGGER_NAME, client=client1) batch = logger.batch(client2) self.assertIsInstance(batch, Batch) - self.assertTrue(batch.logger is logger) - self.assertTrue(batch.client is client2) + self.assertIs(batch.logger, logger) + self.assertIs(batch.client, client2) def test_log_text_w_str_implicit_client(self): TEXT = 'TEXT' @@ -404,8 +404,8 @@ def test_ctor_defaults(self): logger = _Logger() client = _Client(project=self.PROJECT) batch = self._makeOne(logger, client) - self.assertTrue(batch.logger is logger) - self.assertTrue(batch.client is client) + self.assertIs(batch.logger, logger) + self.assertIs(batch.client, client) self.assertEqual(len(batch.entries), 0) def test_log_text_defaults(self): diff --git a/unit_tests/logging/test_metric.py b/unit_tests/logging/test_metric.py index e4e93279b280..865afc1e68f4 100644 --- a/unit_tests/logging/test_metric.py +++ b/unit_tests/logging/test_metric.py @@ -36,7 +36,7 @@ def test_ctor_defaults(self): self.assertEqual(metric.name, self.METRIC_NAME) self.assertEqual(metric.filter_, None) self.assertEqual(metric.description, '') - self.assertTrue(metric.client is client) + self.assertIs(metric.client, client) self.assertEqual(metric.project, self.PROJECT) self.assertEqual(metric.full_name, FULL) self.assertEqual(metric.path, '/%s' % (FULL,)) @@ -49,7 +49,7 @@ def test_ctor_explicit(self): self.assertEqual(metric.name, self.METRIC_NAME) self.assertEqual(metric.filter_, self.FILTER) self.assertEqual(metric.description, self.DESCRIPTION) - self.assertTrue(metric.client is client) + self.assertIs(metric.client, client) self.assertEqual(metric.project, self.PROJECT) self.assertEqual(metric.full_name, FULL) self.assertEqual(metric.path, '/%s' % (FULL,)) @@ -66,7 +66,7 @@ def test_from_api_repr_minimal(self): self.assertEqual(metric.name, self.METRIC_NAME) self.assertEqual(metric.filter_, self.FILTER) self.assertEqual(metric.description, '') - self.assertTrue(metric._client is client) + self.assertIs(metric._client, client) self.assertEqual(metric.project, self.PROJECT) self.assertEqual(metric.full_name, FULL) @@ -84,7 +84,7 @@ def test_from_api_repr_w_description(self): self.assertEqual(metric.name, self.METRIC_NAME) self.assertEqual(metric.filter_, self.FILTER) self.assertEqual(metric.description, DESCRIPTION) - self.assertTrue(metric._client is client) + self.assertIs(metric._client, client) self.assertEqual(metric.project, self.PROJECT) self.assertEqual(metric.full_name, FULL) diff --git a/unit_tests/logging/test_sink.py b/unit_tests/logging/test_sink.py index 6d1989845517..34cb6ace1e6d 100644 --- a/unit_tests/logging/test_sink.py +++ b/unit_tests/logging/test_sink.py @@ -36,7 +36,7 @@ def test_ctor_defaults(self): self.assertEqual(sink.name, self.SINK_NAME) self.assertEqual(sink.filter_, None) self.assertEqual(sink.destination, None) - self.assertTrue(sink.client is client) + self.assertIs(sink.client, client) self.assertEqual(sink.project, self.PROJECT) self.assertEqual(sink.full_name, FULL) self.assertEqual(sink.path, '/%s' % (FULL,)) @@ -49,7 +49,7 @@ def test_ctor_explicit(self): self.assertEqual(sink.name, self.SINK_NAME) self.assertEqual(sink.filter_, self.FILTER) self.assertEqual(sink.destination, self.DESTINATION_URI) - self.assertTrue(sink.client is client) + self.assertIs(sink.client, client) self.assertEqual(sink.project, self.PROJECT) self.assertEqual(sink.full_name, FULL) self.assertEqual(sink.path, '/%s' % (FULL,)) @@ -67,7 +67,7 @@ def test_from_api_repr_minimal(self): self.assertEqual(sink.name, self.SINK_NAME) self.assertEqual(sink.filter_, self.FILTER) self.assertEqual(sink.destination, self.DESTINATION_URI) - self.assertTrue(sink._client is client) + self.assertIs(sink._client, client) self.assertEqual(sink.project, self.PROJECT) self.assertEqual(sink.full_name, FULL) @@ -84,7 +84,7 @@ def test_from_api_repr_w_description(self): self.assertEqual(sink.name, self.SINK_NAME) self.assertEqual(sink.filter_, self.FILTER) self.assertEqual(sink.destination, self.DESTINATION_URI) - self.assertTrue(sink._client is client) + self.assertIs(sink._client, client) self.assertEqual(sink.project, self.PROJECT) self.assertEqual(sink.full_name, FULL) diff --git a/unit_tests/pubsub/test__gax.py b/unit_tests/pubsub/test__gax.py index 794db56f9738..4ce51c73cfde 100644 --- a/unit_tests/pubsub/test__gax.py +++ b/unit_tests/pubsub/test__gax.py @@ -51,7 +51,7 @@ def _getTargetClass(self): def test_ctor(self): gax_api = _GAXPublisherAPI() api = self._makeOne(gax_api) - self.assertTrue(api._gax_api is gax_api) + self.assertIs(api._gax_api, gax_api) def test_list_topics_no_paging(self): from google.gax import INITIAL_PAGE @@ -72,7 +72,7 @@ def test_list_topics_no_paging(self): name, page_size, options = gax_api._list_topics_called_with self.assertEqual(name, self.PROJECT_PATH) self.assertEqual(page_size, 0) - self.assertTrue(options.page_token is INITIAL_PAGE) + self.assertIs(options.page_token, INITIAL_PAGE) def test_list_topics_with_paging(self): from unit_tests._testing import _GAXPageIterator @@ -288,7 +288,7 @@ def test_topic_list_subscriptions_no_paging(self): gax_api._list_topic_subscriptions_called_with) self.assertEqual(topic_path, self.TOPIC_PATH) self.assertEqual(page_size, 0) - self.assertTrue(options.page_token is INITIAL_PAGE) + self.assertIs(options.page_token, INITIAL_PAGE) def test_topic_list_subscriptions_with_paging(self): from unit_tests._testing import _GAXPageIterator @@ -329,7 +329,7 @@ def test_topic_list_subscriptions_miss(self): gax_api._list_topic_subscriptions_called_with) self.assertEqual(topic_path, self.TOPIC_PATH) self.assertEqual(page_size, 0) - self.assertTrue(options.page_token is INITIAL_PAGE) + self.assertIs(options.page_token, INITIAL_PAGE) def test_topic_list_subscriptions_error(self): from google.gax import INITIAL_PAGE @@ -345,7 +345,7 @@ def test_topic_list_subscriptions_error(self): gax_api._list_topic_subscriptions_called_with) self.assertEqual(topic_path, self.TOPIC_PATH) self.assertEqual(page_size, 0) - self.assertTrue(options.page_token is INITIAL_PAGE) + self.assertIs(options.page_token, INITIAL_PAGE) @unittest.skipUnless(_HAVE_GAX, 'No gax-python') @@ -360,7 +360,7 @@ def _getTargetClass(self): def test_ctor(self): gax_api = _GAXSubscriberAPI() api = self._makeOne(gax_api) - self.assertTrue(api._gax_api is gax_api) + self.assertIs(api._gax_api, gax_api) def test_list_subscriptions_no_paging(self): from google.gax import INITIAL_PAGE @@ -385,7 +385,7 @@ def test_list_subscriptions_no_paging(self): name, page_size, options = gax_api._list_subscriptions_called_with self.assertEqual(name, self.PROJECT_PATH) self.assertEqual(page_size, 0) - self.assertTrue(options.page_token is INITIAL_PAGE) + self.assertIs(options.page_token, INITIAL_PAGE) def test_list_subscriptions_with_paging(self): from unit_tests._testing import _GAXPageIterator diff --git a/unit_tests/pubsub/test_client.py b/unit_tests/pubsub/test_client.py index 69f6ccbed330..306b496ed52e 100644 --- a/unit_tests/pubsub/test_client.py +++ b/unit_tests/pubsub/test_client.py @@ -41,10 +41,10 @@ def test_publisher_api_wo_gax(self): api = client.publisher_api self.assertIsInstance(api, _PublisherAPI) - self.assertTrue(api._connection is conn) + self.assertIs(api._connection, conn) # API instance is cached again = client.publisher_api - self.assertTrue(again is api) + self.assertIs(again, api) def test_publisher_api_w_gax(self): from google.cloud.pubsub import client as MUT @@ -72,10 +72,10 @@ def __init__(self, _wrapped): api = client.publisher_api self.assertIsInstance(api, _GaxPublisherAPI) - self.assertTrue(api._wrapped is wrapped) + self.assertIs(api._wrapped, wrapped) # API instance is cached again = client.publisher_api - self.assertTrue(again is api) + self.assertIs(again, api) args = (client.connection,) self.assertEqual(_called_with, [(args, {})]) @@ -91,10 +91,10 @@ def test_subscriber_api_wo_gax(self): api = client.subscriber_api self.assertIsInstance(api, _SubscriberAPI) - self.assertTrue(api._connection is conn) + self.assertIs(api._connection, conn) # API instance is cached again = client.subscriber_api - self.assertTrue(again is api) + self.assertIs(again, api) def test_subscriber_api_w_gax(self): from google.cloud.pubsub import client as MUT @@ -122,10 +122,10 @@ def __init__(self, _wrapped): api = client.subscriber_api self.assertIsInstance(api, _GaxSubscriberAPI) - self.assertTrue(api._wrapped is wrapped) + self.assertIs(api._wrapped, wrapped) # API instance is cached again = client.subscriber_api - self.assertTrue(again is api) + self.assertIs(again, api) args = (client.connection,) self.assertEqual(_called_with, [(args, {})]) @@ -136,10 +136,10 @@ def test_iam_policy_api(self): conn = client.connection = object() api = client.iam_policy_api self.assertIsInstance(api, _IAMPolicyAPI) - self.assertTrue(api._connection is conn) + self.assertIs(api._connection, conn) # API instance is cached again = client.iam_policy_api - self.assertTrue(again is api) + self.assertIs(again, api) def test_list_topics_no_paging(self): from google.cloud.pubsub.topic import Topic @@ -269,7 +269,7 @@ def test_topic(self): client_obj = self._makeOne(project=PROJECT, credentials=creds) new_topic = client_obj.topic(TOPIC_NAME) self.assertEqual(new_topic.name, TOPIC_NAME) - self.assertTrue(new_topic._client is client_obj) + self.assertIs(new_topic._client, client_obj) self.assertEqual(new_topic.project, PROJECT) self.assertEqual(new_topic.full_name, 'projects/%s/topics/%s' % (PROJECT, TOPIC_NAME)) diff --git a/unit_tests/pubsub/test_connection.py b/unit_tests/pubsub/test_connection.py index a7f3a49ac188..55b00ae9eeec 100644 --- a/unit_tests/pubsub/test_connection.py +++ b/unit_tests/pubsub/test_connection.py @@ -102,7 +102,7 @@ def _makeOne(self, *args, **kw): def test_ctor(self): connection = _Connection() api = self._makeOne(connection) - self.assertTrue(api._connection is connection) + self.assertIs(api._connection, connection) def test_list_topics_no_paging(self): RETURNED = {'topics': [{'name': self.TOPIC_PATH}]} @@ -363,7 +363,7 @@ def _makeOne(self, *args, **kw): def test_ctor(self): connection = _Connection() api = self._makeOne(connection) - self.assertTrue(api._connection is connection) + self.assertIs(api._connection, connection) def test_list_subscriptions_no_paging(self): SUB_INFO = {'name': self.SUB_PATH, 'topic': self.TOPIC_PATH} @@ -613,7 +613,7 @@ def _getTargetClass(self): def test_ctor(self): connection = _Connection() api = self._makeOne(connection) - self.assertTrue(api._connection is connection) + self.assertIs(api._connection, connection) def test_get_iam_policy(self): from google.cloud.pubsub.iam import OWNER_ROLE diff --git a/unit_tests/pubsub/test_subscription.py b/unit_tests/pubsub/test_subscription.py index fc78e25d4c9f..32b7b337e1da 100644 --- a/unit_tests/pubsub/test_subscription.py +++ b/unit_tests/pubsub/test_subscription.py @@ -36,7 +36,7 @@ def test_ctor_defaults(self): topic = _Topic(self.TOPIC_NAME, client=client) subscription = self._makeOne(self.SUB_NAME, topic) self.assertEqual(subscription.name, self.SUB_NAME) - self.assertTrue(subscription.topic is topic) + self.assertIs(subscription.topic, topic) self.assertEqual(subscription.ack_deadline, None) self.assertEqual(subscription.push_endpoint, None) @@ -46,7 +46,7 @@ def test_ctor_explicit(self): subscription = self._makeOne(self.SUB_NAME, topic, self.DEADLINE, self.ENDPOINT) self.assertEqual(subscription.name, self.SUB_NAME) - self.assertTrue(subscription.topic is topic) + self.assertIs(subscription.topic, topic) self.assertEqual(subscription.ack_deadline, self.DEADLINE) self.assertEqual(subscription.push_endpoint, self.ENDPOINT) @@ -111,7 +111,7 @@ def test_from_api_repr_w_topics_no_topic_match(self): self.assertEqual(subscription.name, self.SUB_NAME) topic = subscription.topic self.assertIsInstance(topic, Topic) - self.assertTrue(topic is topics[self.TOPIC_PATH]) + self.assertIs(topic, topics[self.TOPIC_PATH]) self.assertEqual(topic.name, self.TOPIC_NAME) self.assertEqual(topic.project, self.PROJECT) self.assertEqual(subscription.ack_deadline, self.DEADLINE) @@ -128,7 +128,7 @@ def test_from_api_repr_w_topics_w_topic_match(self): klass = self._getTargetClass() subscription = klass.from_api_repr(resource, client, topics=topics) self.assertEqual(subscription.name, self.SUB_NAME) - self.assertTrue(subscription.topic is topic) + self.assertIs(subscription.topic, topic) self.assertEqual(subscription.ack_deadline, self.DEADLINE) self.assertEqual(subscription.push_endpoint, self.ENDPOINT) @@ -150,7 +150,7 @@ def test_autoack_defaults(self): subscription = self._makeOne(self.SUB_NAME, topic) auto_ack = subscription.auto_ack() self.assertIsInstance(auto_ack, AutoAck) - self.assertTrue(auto_ack._subscription is subscription) + self.assertIs(auto_ack._subscription, subscription) self.assertEqual(auto_ack._return_immediately, False) self.assertEqual(auto_ack._max_messages, 1) self.assertIsNone(auto_ack._client) @@ -163,10 +163,10 @@ def test_autoack_explicit(self): subscription = self._makeOne(self.SUB_NAME, topic) auto_ack = subscription.auto_ack(True, 10, client2) self.assertIsInstance(auto_ack, AutoAck) - self.assertTrue(auto_ack._subscription is subscription) + self.assertIs(auto_ack._subscription, subscription) self.assertEqual(auto_ack._return_immediately, True) self.assertEqual(auto_ack._max_messages, 10) - self.assertTrue(auto_ack._client is client2) + self.assertIs(auto_ack._client, client2) def test_create_pull_wo_ack_deadline_w_bound_client(self): RESPONSE = { @@ -694,10 +694,10 @@ def test_ctor_explicit(self): auto_ack = self._makeOne( subscription, return_immediately=True, max_messages=10, client=CLIENT) - self.assertTrue(auto_ack._subscription is subscription) + self.assertIs(auto_ack._subscription, subscription) self.assertEqual(auto_ack._return_immediately, True) self.assertEqual(auto_ack._max_messages, 10) - self.assertTrue(auto_ack._client is CLIENT) + self.assertIs(auto_ack._client, CLIENT) def test___enter___w_defaults(self): subscription = _FauxSubscription(()) @@ -706,7 +706,7 @@ def test___enter___w_defaults(self): with auto_ack as returned: pass - self.assertTrue(returned is auto_ack) + self.assertIs(returned, auto_ack) self.assertEqual(subscription._return_immediately, False) self.assertEqual(subscription._max_messages, 1) self.assertIsNone(subscription._client) @@ -721,10 +721,10 @@ def test___enter___w_explicit(self): with auto_ack as returned: pass - self.assertTrue(returned is auto_ack) + self.assertIs(returned, auto_ack) self.assertEqual(subscription._return_immediately, True) self.assertEqual(subscription._max_messages, 10) - self.assertTrue(subscription._client is CLIENT) + self.assertIs(subscription._client, CLIENT) def test___exit___(self): CLIENT = object() @@ -744,7 +744,7 @@ def test___exit___(self): del auto_ack[ack_id] self.assertEqual(sorted(subscription._acknowledged), [ACK_ID1, ACK_ID2]) - self.assertTrue(subscription._ack_client is CLIENT) + self.assertIs(subscription._ack_client, CLIENT) class _FauxIAMPolicy(object): diff --git a/unit_tests/pubsub/test_topic.py b/unit_tests/pubsub/test_topic.py index 67d2e0001b1b..03f8a5e8abdd 100644 --- a/unit_tests/pubsub/test_topic.py +++ b/unit_tests/pubsub/test_topic.py @@ -43,7 +43,7 @@ def test_from_api_repr(self): klass = self._getTargetClass() topic = klass.from_api_repr(resource, client=client) self.assertEqual(topic.name, self.TOPIC_NAME) - self.assertTrue(topic._client is client) + self.assertIs(topic._client, client) self.assertEqual(topic.project, self.PROJECT) self.assertEqual(topic.full_name, self.TOPIC_PATH) @@ -295,7 +295,7 @@ def test_subscription(self): subscription = topic.subscription(SUBSCRIPTION_NAME) self.assertIsInstance(subscription, Subscription) self.assertEqual(subscription.name, SUBSCRIPTION_NAME) - self.assertTrue(subscription.topic is topic) + self.assertIs(subscription.topic, topic) def test_list_subscriptions_no_paging(self): from google.cloud.pubsub.subscription import Subscription @@ -320,12 +320,12 @@ def test_list_subscriptions_no_paging(self): subscription = subscriptions[0] self.assertIsInstance(subscription, Subscription) self.assertEqual(subscriptions[0].name, SUB_NAME_1) - self.assertTrue(subscription.topic is topic) + self.assertIs(subscription.topic, topic) subscription = subscriptions[1] self.assertIsInstance(subscription, Subscription) self.assertEqual(subscriptions[1].name, SUB_NAME_2) - self.assertTrue(subscription.topic is topic) + self.assertIs(subscription.topic, topic) self.assertEqual(next_page_token, TOKEN) self.assertEqual(api._topic_listed, @@ -356,12 +356,12 @@ def test_list_subscriptions_with_paging(self): subscription = subscriptions[0] self.assertIsInstance(subscription, Subscription) self.assertEqual(subscriptions[0].name, SUB_NAME_1) - self.assertTrue(subscription.topic is topic) + self.assertIs(subscription.topic, topic) subscription = subscriptions[1] self.assertIsInstance(subscription, Subscription) self.assertEqual(subscriptions[1].name, SUB_NAME_2) - self.assertTrue(subscription.topic is topic) + self.assertIs(subscription.topic, topic) self.assertEqual(next_page_token, None) self.assertEqual(api._topic_listed, @@ -579,8 +579,8 @@ def test_ctor_defaults(self): topic = _Topic() client = _Client(project=self.PROJECT) batch = self._makeOne(topic, client) - self.assertTrue(batch.topic is topic) - self.assertTrue(batch.client is client) + self.assertIs(batch.topic, topic) + self.assertIs(batch.client, client) self.assertEqual(len(batch.messages), 0) self.assertEqual(len(batch.message_ids), 0) @@ -698,7 +698,7 @@ def test_context_mgr_success(self): batch.publish(PAYLOAD1) batch.publish(PAYLOAD2, attr1='value1', attr2='value2') - self.assertTrue(other is batch) + self.assertIs(other, batch) self.assertEqual(list(batch), [MSGID1, MSGID2]) self.assertEqual(list(batch.messages), []) self.assertEqual(api._topic_published, @@ -727,7 +727,7 @@ def test_context_mgr_failure(self): except _Bugout: pass - self.assertTrue(other is batch) + self.assertIs(other, batch) self.assertEqual(list(batch), []) self.assertEqual(list(batch.messages), [MESSAGE1, MESSAGE2]) self.assertEqual(getattr(api, '_topic_published', self), self) diff --git a/unit_tests/resource_manager/test_client.py b/unit_tests/resource_manager/test_client.py index 153e762168bb..0999af48b6be 100644 --- a/unit_tests/resource_manager/test_client.py +++ b/unit_tests/resource_manager/test_client.py @@ -30,7 +30,7 @@ def test_constructor(self): self.assertEqual(iterator.path, '/projects') self.assertEqual(iterator.page_number, 0) self.assertEqual(iterator.next_page_token, None) - self.assertTrue(iterator.client is client) + self.assertIs(iterator.client, client) self.assertEqual(iterator.extra_params, {}) def test_get_items_from_response_empty(self): diff --git a/unit_tests/storage/test__helpers.py b/unit_tests/storage/test__helpers.py index c73cc669c159..ef46ecc5efb6 100644 --- a/unit_tests/storage/test__helpers.py +++ b/unit_tests/storage/test__helpers.py @@ -162,7 +162,7 @@ def read(self, block_size): SIGNED_CONTENT = self._callFUT(BUFFER) self.assertEqual(BUFFER._block_sizes, [8192, 8192]) - self.assertTrue(SIGNED_CONTENT is DIGEST_VAL) + self.assertIs(SIGNED_CONTENT, DIGEST_VAL) self.assertEqual(BASE64._called_b64encode, [DIGEST_VAL]) self.assertEqual(MD5._called, [None]) self.assertEqual(MD5.hash_obj.num_digest_calls, 1) diff --git a/unit_tests/storage/test_acl.py b/unit_tests/storage/test_acl.py index 05baaba14f2f..5a6844863710 100644 --- a/unit_tests/storage/test_acl.py +++ b/unit_tests/storage/test_acl.py @@ -319,7 +319,7 @@ def test_get_entity_miss_str_w_default(self): DEFAULT = object() acl = self._makeOne() acl.loaded = True - self.assertTrue(acl.get_entity('nonesuch', DEFAULT) is DEFAULT) + self.assertIs(acl.get_entity('nonesuch', DEFAULT), DEFAULT) def test_get_entity_miss_entity_w_default(self): from google.cloud.storage.acl import _ACLEntity @@ -329,7 +329,7 @@ def test_get_entity_miss_entity_w_default(self): entity = _ACLEntity(TYPE, ID) acl = self._makeOne() acl.loaded = True - self.assertTrue(acl.get_entity(entity, DEFAULT) is DEFAULT) + self.assertIs(acl.get_entity(entity, DEFAULT), DEFAULT) def test_get_entity_hit_str(self): TYPE = 'type' @@ -396,7 +396,7 @@ def test_add_entity_hit(self): acl.add_entity(entity) self.assertTrue(acl.loaded) self.assertFalse(acl.get_entity(ENTITY_VAL) is before) - self.assertTrue(acl.get_entity(ENTITY_VAL) is entity) + self.assertIs(acl.get_entity(ENTITY_VAL), entity) self.assertEqual(list(acl), [{'entity': 'type-id', 'role': ROLE}]) self.assertEqual(list(acl.get_entities()), [entity]) @@ -423,7 +423,7 @@ def test_entity_hit(self): before = acl.entity(TYPE, ID) before.grant(ROLE) entity = acl.entity(TYPE, ID) - self.assertTrue(entity is before) + self.assertIs(entity, before) self.assertEqual(list(acl), [{'entity': 'type-id', 'role': ROLE}]) self.assertEqual(list(acl.get_entities()), [entity]) @@ -723,7 +723,7 @@ def test_ctor(self): acl = self._makeOne(bucket) self.assertEqual(acl.entities, {}) self.assertFalse(acl.loaded) - self.assertTrue(acl.bucket is bucket) + self.assertIs(acl.bucket, bucket) self.assertEqual(acl.reload_path, '/b/%s/acl' % NAME) self.assertEqual(acl.save_path, '/b/%s' % NAME) @@ -743,7 +743,7 @@ def test_ctor(self): acl = self._makeOne(bucket) self.assertEqual(acl.entities, {}) self.assertFalse(acl.loaded) - self.assertTrue(acl.bucket is bucket) + self.assertIs(acl.bucket, bucket) self.assertEqual(acl.reload_path, '/b/%s/defaultObjectAcl' % NAME) self.assertEqual(acl.save_path, '/b/%s' % NAME) @@ -765,7 +765,7 @@ def test_ctor(self): acl = self._makeOne(blob) self.assertEqual(acl.entities, {}) self.assertFalse(acl.loaded) - self.assertTrue(acl.blob is blob) + self.assertIs(acl.blob, blob) self.assertEqual(acl.reload_path, '/b/%s/o/%s/acl' % (NAME, BLOB_NAME)) self.assertEqual(acl.save_path, '/b/%s/o/%s' % (NAME, BLOB_NAME)) diff --git a/unit_tests/storage/test_batch.py b/unit_tests/storage/test_batch.py index 43c0b1fb2cde..ee2c8f1fccf6 100644 --- a/unit_tests/storage/test_batch.py +++ b/unit_tests/storage/test_batch.py @@ -80,7 +80,7 @@ def test_ctor(self): connection = _Connection(http=http) client = _Client(connection) batch = self._makeOne(client) - self.assertTrue(batch._client is client) + self.assertIs(batch._client, client) self.assertEqual(len(batch._requests), 0) self.assertEqual(len(batch._target_objects), 0) @@ -93,11 +93,11 @@ def test_current(self): self.assertIsNone(batch1.current()) client._push_batch(batch1) - self.assertTrue(batch1.current() is batch1) + self.assertIs(batch1.current(), batch1) batch2 = self._makeOne(client) client._push_batch(batch2) - self.assertTrue(batch1.current() is batch2) + self.assertIs(batch1.current(), batch2) def test__make_request_GET_normal(self): from google.cloud.storage.batch import _FutureDict @@ -111,7 +111,7 @@ def test__make_request_GET_normal(self): target_object=target) self.assertEqual(response.status, 204) self.assertIsInstance(content, _FutureDict) - self.assertTrue(target._properties is content) + self.assertIs(target._properties, content) self.assertEqual(http._requests, []) EXPECTED_HEADERS = [ ('Accept-Encoding', 'gzip'), @@ -136,7 +136,7 @@ def test__make_request_POST_normal(self): target_object=target) self.assertEqual(response.status, 204) self.assertIsInstance(content, _FutureDict) - self.assertTrue(target._properties is content) + self.assertIs(target._properties, content) self.assertEqual(http._requests, []) EXPECTED_HEADERS = [ ('Accept-Encoding', 'gzip'), @@ -161,7 +161,7 @@ def test__make_request_PATCH_normal(self): target_object=target) self.assertEqual(response.status, 204) self.assertIsInstance(content, _FutureDict) - self.assertTrue(target._properties is content) + self.assertIs(target._properties, content) self.assertEqual(http._requests, []) EXPECTED_HEADERS = [ ('Accept-Encoding', 'gzip'), @@ -186,7 +186,7 @@ def test__make_request_DELETE_normal(self): target_object=target) self.assertEqual(response.status, 204) self.assertIsInstance(content, _FutureDict) - self.assertTrue(target._properties is content) + self.assertIs(target._properties, content) self.assertEqual(http._requests, []) EXPECTED_HEADERS = [ ('Accept-Encoding', 'gzip'), @@ -209,14 +209,14 @@ def test__make_request_POST_too_many_requests(self): batch._requests.append(('POST', URL, {}, {'bar': 2})) self.assertRaises(ValueError, batch._make_request, 'POST', URL, data={'foo': 1}) - self.assertTrue(connection.http is http) + self.assertIs(connection.http, http) def test_finish_empty(self): http = _HTTP() # no requests expected connection = _Connection(http=http) batch = self._makeOne(connection) self.assertRaises(ValueError, batch.finish) - self.assertTrue(connection.http is http) + self.assertIs(connection.http, http) def _check_subrequest_no_payload(self, chunk, method, url): lines = chunk.splitlines() @@ -335,7 +335,7 @@ def test_finish_nonempty_with_status_failure(self): self.assertRaises(NotFound, batch.finish) self.assertEqual(target1._properties, {'foo': 1, 'bar': 2}) - self.assertTrue(target2._properties is target2_future_before) + self.assertIs(target2._properties, target2_future_before) self.assertEqual(len(http._requests), 1) method, uri, headers, body = http._requests[0] @@ -550,7 +550,7 @@ def test___getitem__(self): value = orig_value = object() with self.assertRaises(KeyError): value = future[None] - self.assertTrue(value is orig_value) + self.assertIs(value, orig_value) def test___setitem__(self): future = self._makeOne() diff --git a/unit_tests/storage/test_blob.py b/unit_tests/storage/test_blob.py index 15248a4d0e24..db11f856d164 100644 --- a/unit_tests/storage/test_blob.py +++ b/unit_tests/storage/test_blob.py @@ -29,11 +29,11 @@ def test_ctor(self): bucket = _Bucket() properties = {'key': 'value'} blob = self._makeOne(BLOB_NAME, bucket=bucket, properties=properties) - self.assertTrue(blob.bucket is bucket) + self.assertIs(blob.bucket, bucket) self.assertEqual(blob.name, BLOB_NAME) self.assertEqual(blob._properties, properties) self.assertFalse(blob._acl.loaded) - self.assertTrue(blob._acl.blob is blob) + self.assertIs(blob._acl.blob, blob) def test_chunk_size_ctor(self): from google.cloud.storage.blob import Blob @@ -50,7 +50,7 @@ def test_chunk_size_getter(self): self.assertEqual(blob.chunk_size, None) VALUE = object() blob._chunk_size = VALUE - self.assertTrue(blob.chunk_size is VALUE) + self.assertIs(blob.chunk_size, VALUE) def test_chunk_size_setter(self): BLOB_NAME = 'blob-name' @@ -76,7 +76,7 @@ def test_acl_property(self): blob = self._makeOne(None, bucket=FAKE_BUCKET) acl = blob.acl self.assertIsInstance(acl, ObjectACL) - self.assertTrue(acl is blob._acl) + self.assertIs(acl, blob._acl) def test_path_no_bucket(self): FAKE_BUCKET = object() diff --git a/unit_tests/storage/test_bucket.py b/unit_tests/storage/test_bucket.py index b35a30481dd6..cfb3809ceeb0 100644 --- a/unit_tests/storage/test_bucket.py +++ b/unit_tests/storage/test_bucket.py @@ -29,8 +29,8 @@ def test_ctor(self): client = _Client(connection) bucket = _Bucket() iterator = self._makeOne(bucket, client=client) - self.assertTrue(iterator.bucket is bucket) - self.assertTrue(iterator.client is client) + self.assertIs(iterator.bucket, bucket) + self.assertIs(iterator.client, client) self.assertEqual(iterator.path, '%s/o' % bucket.path) self.assertEqual(iterator.page_number, 0) self.assertEqual(iterator.next_page_token, None) @@ -103,9 +103,9 @@ def test_ctor(self): self.assertEqual(bucket.name, NAME) self.assertEqual(bucket._properties, properties) self.assertFalse(bucket._acl.loaded) - self.assertTrue(bucket._acl.bucket is bucket) + self.assertIs(bucket._acl.bucket, bucket) self.assertFalse(bucket._default_object_acl.loaded) - self.assertTrue(bucket._default_object_acl.bucket is bucket) + self.assertIs(bucket._default_object_acl.bucket, bucket) def test_blob(self): from google.cloud.storage.blob import Blob @@ -117,8 +117,8 @@ def test_blob(self): bucket = self._makeOne(name=BUCKET_NAME) blob = bucket.blob(BLOB_NAME, chunk_size=CHUNK_SIZE) self.assertIsInstance(blob, Blob) - self.assertTrue(blob.bucket is bucket) - self.assertTrue(blob.client is bucket.client) + self.assertIs(blob.bucket, bucket) + self.assertIs(blob.client, bucket.client) self.assertEqual(blob.name, BLOB_NAME) self.assertEqual(blob.chunk_size, CHUNK_SIZE) @@ -234,14 +234,14 @@ def test_acl_property(self): bucket = self._makeOne() acl = bucket.acl self.assertIsInstance(acl, BucketACL) - self.assertTrue(acl is bucket._acl) + self.assertIs(acl, bucket._acl) def test_default_object_acl_property(self): from google.cloud.storage.acl import DefaultObjectACL bucket = self._makeOne() acl = bucket.default_object_acl self.assertIsInstance(acl, DefaultObjectACL) - self.assertTrue(acl is bucket._default_object_acl) + self.assertIs(acl, bucket._default_object_acl) def test_path_no_name(self): bucket = self._makeOne() @@ -271,7 +271,7 @@ def test_get_blob_hit(self): client = _Client(connection) bucket = self._makeOne(name=NAME) blob = bucket.get_blob(BLOB_NAME, client=client) - self.assertTrue(blob.bucket is bucket) + self.assertIs(blob.bucket, bucket) self.assertEqual(blob.name, BLOB_NAME) kw, = connection._requested self.assertEqual(kw['method'], 'GET') @@ -526,7 +526,7 @@ class _Blob(object): dest = self._makeOne(client=client, name=DEST) blob = _Blob() new_blob = source.copy_blob(blob, dest) - self.assertTrue(new_blob.bucket is dest) + self.assertIs(new_blob.bucket, dest) self.assertEqual(new_blob.name, BLOB_NAME) kw, = connection._requested COPY_PATH = '/b/%s/o/%s/copyTo/b/%s/o/%s' % (SOURCE, BLOB_NAME, @@ -550,7 +550,7 @@ class _Blob(object): dest = self._makeOne(client=client, name=DEST) blob = _Blob() new_blob = source.copy_blob(blob, dest, NEW_NAME) - self.assertTrue(new_blob.bucket is dest) + self.assertIs(new_blob.bucket, dest) self.assertEqual(new_blob.name, NEW_NAME) kw, = connection._requested COPY_PATH = '/b/%s/o/%s/copyTo/b/%s/o/%s' % (SOURCE, BLOB_NAME, @@ -580,7 +580,7 @@ def delete(self, client=None): blob = _Blob(BLOB_NAME, BUCKET_NAME) renamed_blob = bucket.rename_blob(blob, NEW_BLOB_NAME, client=client) - self.assertTrue(renamed_blob.bucket is bucket) + self.assertIs(renamed_blob.bucket, bucket) self.assertEqual(renamed_blob.name, NEW_BLOB_NAME) self.assertEqual(blob._deleted, [client]) @@ -704,7 +704,7 @@ def test_disable_logging(self): NAME = 'name' before = {'logging': {'logBucket': 'logs', 'logObjectPrefix': 'pfx'}} bucket = self._makeOne(name=NAME, properties=before) - self.assertTrue(bucket.get_logging() is not None) + self.assertIs(bucket.get_logging(), not None) bucket.disable_logging() self.assertIsNone(bucket.get_logging()) diff --git a/unit_tests/storage/test_client.py b/unit_tests/storage/test_client.py index a0ca33c1c999..c8d30dc4c65c 100644 --- a/unit_tests/storage/test_client.py +++ b/unit_tests/storage/test_client.py @@ -33,7 +33,7 @@ def test_ctor_connection_type(self): client = self._makeOne(project=PROJECT, credentials=CREDENTIALS) self.assertEqual(client.project, PROJECT) self.assertIsInstance(client.connection, Connection) - self.assertTrue(client.connection.credentials is CREDENTIALS) + self.assertIs(client.connection.credentials, CREDENTIALS) self.assertIsNone(client.current_batch) self.assertEqual(list(client._batch_stack), []) @@ -48,14 +48,14 @@ def test__push_batch_and__pop_batch(self): batch2 = Batch(client) client._push_batch(batch1) self.assertEqual(list(client._batch_stack), [batch1]) - self.assertTrue(client.current_batch is batch1) + self.assertIs(client.current_batch, batch1) client._push_batch(batch2) - self.assertTrue(client.current_batch is batch2) + self.assertIs(client.current_batch, batch2) # list(_LocalStack) returns in reverse order. self.assertEqual(list(client._batch_stack), [batch2, batch1]) - self.assertTrue(client._pop_batch() is batch2) + self.assertIs(client._pop_batch(), batch2) self.assertEqual(list(client._batch_stack), [batch1]) - self.assertTrue(client._pop_batch() is batch1) + self.assertIs(client._pop_batch(), batch1) self.assertEqual(list(client._batch_stack), []) def test_connection_setter(self): @@ -64,7 +64,7 @@ def test_connection_setter(self): client = self._makeOne(project=PROJECT, credentials=CREDENTIALS) client._connection = None # Unset the value from the constructor client.connection = connection = object() - self.assertTrue(client._connection is connection) + self.assertIs(client._connection, connection) def test_connection_setter_when_set(self): PROJECT = 'PROJECT' @@ -76,7 +76,7 @@ def test_connection_getter_no_batch(self): PROJECT = 'PROJECT' CREDENTIALS = _Credentials() client = self._makeOne(project=PROJECT, credentials=CREDENTIALS) - self.assertTrue(client.connection is client._connection) + self.assertIs(client.connection, client._connection) self.assertIsNone(client.current_batch) def test_connection_getter_with_batch(self): @@ -86,9 +86,9 @@ def test_connection_getter_with_batch(self): client = self._makeOne(project=PROJECT, credentials=CREDENTIALS) batch = Batch(client) client._push_batch(batch) - self.assertTrue(client.connection is not client._connection) - self.assertTrue(client.connection is batch) - self.assertTrue(client.current_batch is batch) + self.assertIs(client.connection, not client._connection) + self.assertIs(client.connection, batch) + self.assertIs(client.current_batch, batch) def test_bucket(self): from google.cloud.storage.bucket import Bucket @@ -100,7 +100,7 @@ def test_bucket(self): client = self._makeOne(project=PROJECT, credentials=CREDENTIALS) bucket = client.bucket(BUCKET_NAME) self.assertIsInstance(bucket, Bucket) - self.assertTrue(bucket.client is client) + self.assertIs(bucket.client, client) self.assertEqual(bucket.name, BUCKET_NAME) def test_batch(self): @@ -112,7 +112,7 @@ def test_batch(self): client = self._makeOne(project=PROJECT, credentials=CREDENTIALS) batch = client.batch() self.assertIsInstance(batch, Batch) - self.assertTrue(batch._client is client) + self.assertIs(batch._client, client) def test_get_bucket_miss(self): from google.cloud.exceptions import NotFound @@ -386,7 +386,7 @@ def test_ctor(self): self.assertEqual(iterator.path, '/b') self.assertEqual(iterator.page_number, 0) self.assertEqual(iterator.next_page_token, None) - self.assertTrue(iterator.client is client) + self.assertIs(iterator.client, client) def test_get_items_from_response_empty(self): connection = object() diff --git a/unit_tests/streaming/test_buffered_stream.py b/unit_tests/streaming/test_buffered_stream.py index f461e782df80..c56ce7a31faf 100644 --- a/unit_tests/streaming/test_buffered_stream.py +++ b/unit_tests/streaming/test_buffered_stream.py @@ -17,7 +17,7 @@ def test_ctor_start_zero_longer_than_buffer(self): BUFSIZE = 4 stream = BytesIO(CONTENT) bufstream = self._makeOne(stream, START, BUFSIZE) - self.assertTrue(bufstream._stream is stream) + self.assertIs(bufstream._stream, stream) self.assertEqual(bufstream._start_pos, START) self.assertEqual(bufstream._buffer_pos, 0) self.assertEqual(bufstream._buffered_data, CONTENT[:BUFSIZE]) @@ -33,7 +33,7 @@ def test_ctor_start_nonzero_shorter_than_buffer(self): stream = BytesIO(CONTENT) stream.read(START) # already consumed bufstream = self._makeOne(stream, START, BUFSIZE) - self.assertTrue(bufstream._stream is stream) + self.assertIs(bufstream._stream, stream) self.assertEqual(bufstream._start_pos, START) self.assertEqual(bufstream._buffer_pos, 0) self.assertEqual(bufstream._buffered_data, CONTENT[START:]) diff --git a/unit_tests/streaming/test_http_wrapper.py b/unit_tests/streaming/test_http_wrapper.py index 4c664a3d7122..6302d9c4b585 100644 --- a/unit_tests/streaming/test_http_wrapper.py +++ b/unit_tests/streaming/test_http_wrapper.py @@ -96,7 +96,7 @@ def test_body_setter_w_non_string(self): request.loggable_body = 'abc' request.body = body = _Dummy(length=123) self.assertEqual(request.headers, {'content-length': '123'}) - self.assertTrue(request.body is body) + self.assertIs(request.body, body) self.assertEqual(request.loggable_body, '') @@ -371,7 +371,7 @@ def _wo_exception(*args, **kw): _check_response=_checked.append): response = self._callFUT(HTTP, REQUEST) - self.assertTrue(response is RESPONSE) + self.assertIs(response, RESPONSE) expected_kw = {'redirections': MUT._REDIRECTIONS} self.assertEqual(_created, [((HTTP, REQUEST), expected_kw)]) self.assertEqual(_checked, []) # not called by '_wo_exception' @@ -397,7 +397,7 @@ def _wo_exception(*args, **kw): _check_response=_checked.append): response = self._callFUT(HTTP, REQUEST, retries=5) - self.assertTrue(response is RESPONSE) + self.assertIs(response, RESPONSE) self.assertEqual(len(_created), 5) expected_kw = {'redirections': MUT._REDIRECTIONS} for attempt in _created: diff --git a/unit_tests/streaming/test_stream_slice.py b/unit_tests/streaming/test_stream_slice.py index 9f94715f6082..8bbef61d5d15 100644 --- a/unit_tests/streaming/test_stream_slice.py +++ b/unit_tests/streaming/test_stream_slice.py @@ -16,7 +16,7 @@ def test_ctor(self): MAXSIZE = 4 stream = BytesIO(CONTENT) stream_slice = self._makeOne(stream, MAXSIZE) - self.assertTrue(stream_slice._stream is stream) + self.assertIs(stream_slice._stream, stream) self.assertEqual(stream_slice._remaining_bytes, MAXSIZE) self.assertEqual(stream_slice._max_bytes, MAXSIZE) self.assertEqual(len(stream_slice), MAXSIZE) diff --git a/unit_tests/streaming/test_transfer.py b/unit_tests/streaming/test_transfer.py index 7c56a99dda54..01502013651c 100644 --- a/unit_tests/streaming/test_transfer.py +++ b/unit_tests/streaming/test_transfer.py @@ -15,7 +15,7 @@ def test_ctor_defaults(self): from google.cloud.streaming.transfer import _DEFAULT_CHUNKSIZE stream = _Stream() xfer = self._makeOne(stream) - self.assertTrue(xfer.stream is stream) + self.assertIs(xfer.stream, stream) self.assertFalse(xfer.close_stream) self.assertEqual(xfer.chunksize, _DEFAULT_CHUNKSIZE) self.assertTrue(xfer.auto_transfer) @@ -36,19 +36,19 @@ def test_ctor_explicit(self): auto_transfer=False, http=HTTP, num_retries=NUM_RETRIES) - self.assertTrue(xfer.stream is stream) + self.assertIs(xfer.stream, stream) self.assertTrue(xfer.close_stream) self.assertEqual(xfer.chunksize, CHUNK_SIZE) self.assertFalse(xfer.auto_transfer) - self.assertTrue(xfer.bytes_http is HTTP) - self.assertTrue(xfer.http is HTTP) + self.assertIs(xfer.bytes_http, HTTP) + self.assertIs(xfer.http, HTTP) self.assertEqual(xfer.num_retries, NUM_RETRIES) def test_bytes_http_fallback_to_http(self): stream = _Stream() HTTP = object() xfer = self._makeOne(stream, http=HTTP) - self.assertTrue(xfer.bytes_http is HTTP) + self.assertIs(xfer.bytes_http, HTTP) def test_bytes_http_setter(self): stream = _Stream() @@ -56,7 +56,7 @@ def test_bytes_http_setter(self): BYTES_HTTP = object() xfer = self._makeOne(stream, http=HTTP) xfer.bytes_http = BYTES_HTTP - self.assertTrue(xfer.bytes_http is BYTES_HTTP) + self.assertIs(xfer.bytes_http, BYTES_HTTP) def test_num_retries_setter_invalid(self): stream = _Stream() @@ -76,8 +76,8 @@ def test__initialize_not_already_initialized_w_http(self): xfer = self._makeOne(stream) xfer._initialize(HTTP, self.URL) self.assertTrue(xfer.initialized) - self.assertTrue(xfer.http is HTTP) - self.assertTrue(xfer.url is self.URL) + self.assertIs(xfer.http, HTTP) + self.assertIs(xfer.url, self.URL) def test__initialize_not_already_initialized_wo_http(self): from httplib2 import Http @@ -86,7 +86,7 @@ def test__initialize_not_already_initialized_wo_http(self): xfer._initialize(None, self.URL) self.assertTrue(xfer.initialized) self.assertIsInstance(xfer.http, Http) - self.assertTrue(xfer.url is self.URL) + self.assertIs(xfer.url, self.URL) def test__initialize_w_existing_http(self): HTTP_1, HTTP_2 = object(), object() @@ -94,8 +94,8 @@ def test__initialize_w_existing_http(self): xfer = self._makeOne(stream, http=HTTP_1) xfer._initialize(HTTP_2, self.URL) self.assertTrue(xfer.initialized) - self.assertTrue(xfer.http is HTTP_1) - self.assertTrue(xfer.url is self.URL) + self.assertIs(xfer.http, HTTP_1) + self.assertIs(xfer.url, self.URL) def test__initialize_already_initialized(self): from google.cloud.streaming.exceptions import TransferInvalidError @@ -158,7 +158,7 @@ def _makeOne(self, *args, **kw): def test_ctor_defaults(self): stream = _Stream() download = self._makeOne(stream) - self.assertTrue(download.stream is stream) + self.assertIs(download.stream, stream) self.assertIsNone(download._initial_response) self.assertEqual(download.progress, 0) self.assertIsNone(download.total_size) @@ -168,14 +168,14 @@ def test_ctor_w_kwds(self): stream = _Stream() CHUNK_SIZE = 123 download = self._makeOne(stream, chunksize=CHUNK_SIZE) - self.assertTrue(download.stream is stream) + self.assertIs(download.stream, stream) self.assertEqual(download.chunksize, CHUNK_SIZE) def test_ctor_w_total_size(self): stream = _Stream() SIZE = 123 download = self._makeOne(stream, total_size=SIZE) - self.assertTrue(download.stream is stream) + self.assertIs(download.stream, stream) self.assertEqual(download.total_size, SIZE) def test_from_file_w_existing_file_no_override(self): @@ -206,7 +206,7 @@ def test_from_stream_defaults(self): stream = _Stream() klass = self._getTargetClass() download = klass.from_stream(stream) - self.assertTrue(download.stream is stream) + self.assertIs(download.stream, stream) self.assertTrue(download.auto_transfer) self.assertIsNone(download.total_size) @@ -217,7 +217,7 @@ def test_from_stream_explicit(self): klass = self._getTargetClass() download = klass.from_stream(stream, auto_transfer=False, total_size=SIZE, chunksize=CHUNK_SIZE) - self.assertTrue(download.stream is stream) + self.assertIs(download.stream, stream) self.assertFalse(download.auto_transfer) self.assertEqual(download.total_size, SIZE) self.assertEqual(download.chunksize, CHUNK_SIZE) @@ -270,7 +270,7 @@ def test_initialize_download_wo_autotransfer(self): http = object() download = self._makeOne(_Stream(), auto_transfer=False) download.initialize_download(request, http) - self.assertTrue(download.http is http) + self.assertIs(download.http, http) self.assertEqual(download.url, request.url) def test_initialize_download_w_autotransfer_failing(self): @@ -290,7 +290,7 @@ def test_initialize_download_w_autotransfer_failing(self): download.initialize_download(request, http) self.assertTrue(len(requester._requested), 1) - self.assertTrue(requester._requested[0][0] is request) + self.assertIs(requester._requested[0][0], request) def test_initialize_download_w_autotransfer_w_content_location(self): from six.moves import http_client @@ -310,10 +310,10 @@ def test_initialize_download_w_autotransfer_w_content_location(self): self.assertIsNone(download._initial_response) self.assertEqual(download.total_size, 0) - self.assertTrue(download.http is http) + self.assertIs(download.http, http) self.assertEqual(download.url, REDIRECT_URL) self.assertTrue(len(requester._requested), 1) - self.assertTrue(requester._requested[0][0] is request) + self.assertIs(requester._requested[0][0], request) def test__normalize_start_end_w_end_w_start_lt_0(self): from google.cloud.streaming.exceptions import TransferInvalidError @@ -424,7 +424,7 @@ def test__get_chunk(self): make_api_request=requester): found = download._get_chunk(0, 10) - self.assertTrue(found is response) + self.assertIs(found, response) self.assertTrue(len(requester._requested), 1) request = requester._requested[0][0] self.assertEqual(request.headers['range'], 'bytes=0-10') @@ -459,7 +459,7 @@ def test__process_response_w_OK_wo_encoding(self): download = self._makeOne(stream) response = _makeResponse(http_client.OK, content='OK') found = download._process_response(response) - self.assertTrue(found is response) + self.assertIs(found, response) self.assertEqual(stream._written, ['OK']) self.assertEqual(download.progress, 2) self.assertEqual(download.encoding, None) @@ -471,7 +471,7 @@ def test__process_response_w_PARTIAL_CONTENT_w_encoding(self): info = {'content-encoding': 'blah'} response = _makeResponse(http_client.OK, info, 'PARTIAL') found = download._process_response(response) - self.assertTrue(found is response) + self.assertIs(found, response) self.assertEqual(stream._written, ['PARTIAL']) self.assertEqual(download.progress, 7) self.assertEqual(download.encoding, 'blah') @@ -483,7 +483,7 @@ def test__process_response_w_REQUESTED_RANGE_NOT_SATISFIABLE(self): response = _makeResponse( http_client.REQUESTED_RANGE_NOT_SATISFIABLE) found = download._process_response(response) - self.assertTrue(found is response) + self.assertIs(found, response) self.assertEqual(stream._written, []) self.assertEqual(download.progress, 0) self.assertEqual(download.encoding, None) @@ -494,7 +494,7 @@ def test__process_response_w_NO_CONTENT(self): download = self._makeOne(stream) response = _makeResponse(status_code=http_client.NO_CONTENT) found = download._process_response(response) - self.assertTrue(found is response) + self.assertIs(found, response) self.assertEqual(stream._written, ['']) self.assertEqual(download.progress, 0) self.assertEqual(download.encoding, None) @@ -794,7 +794,7 @@ def test_ctor_defaults(self): from google.cloud.streaming.transfer import _DEFAULT_CHUNKSIZE stream = _Stream() upload = self._makeOne(stream) - self.assertTrue(upload.stream is stream) + self.assertIs(upload.stream, stream) self.assertIsNone(upload._final_response) self.assertIsNone(upload._server_chunk_granularity) self.assertFalse(upload.complete) @@ -808,7 +808,7 @@ def test_ctor_w_kwds(self): stream = _Stream() CHUNK_SIZE = 123 upload = self._makeOne(stream, chunksize=CHUNK_SIZE) - self.assertTrue(upload.stream is stream) + self.assertIs(upload.stream, stream) self.assertEqual(upload.mime_type, self.MIME_TYPE) self.assertEqual(upload.chunksize, CHUNK_SIZE) @@ -1147,7 +1147,7 @@ def test_refresh_upload_state_w_OK(self): self.assertTrue(upload.complete) self.assertEqual(upload.progress, LEN) self.assertEqual(stream.tell(), LEN) - self.assertTrue(upload._final_response is response) + self.assertIs(upload._final_response, response) def test_refresh_upload_state_w_CREATED(self): from six.moves import http_client @@ -1174,7 +1174,7 @@ def test_refresh_upload_state_w_CREATED(self): self.assertTrue(upload.complete) self.assertEqual(upload.progress, LEN) self.assertEqual(stream.tell(), LEN) - self.assertTrue(upload._final_response is response) + self.assertIs(upload._final_response, response) def test_refresh_upload_state_w_RESUME_INCOMPLETE_w_range(self): from google.cloud.streaming import transfer as MUT @@ -1323,7 +1323,7 @@ def test_initialize_upload_w_http_wo_auto_transfer_w_OK(self): self.assertEqual(upload.url, self.UPLOAD_URL) self.assertEqual(requester._responses, []) self.assertEqual(len(requester._requested), 1) - self.assertTrue(requester._requested[0][0] is request) + self.assertIs(requester._requested[0][0], request) def test_initialize_upload_w_granularity_w_auto_transfer_w_OK(self): from six.moves import http_client @@ -1350,7 +1350,7 @@ def test_initialize_upload_w_granularity_w_auto_transfer_w_OK(self): self.assertEqual(upload.url, self.UPLOAD_URL) self.assertEqual(requester._responses, []) self.assertEqual(len(requester._requested), 2) - self.assertTrue(requester._requested[0][0] is request) + self.assertIs(requester._requested[0][0], request) chunk_request = requester._requested[1][0] self.assertIsInstance(chunk_request, _Request) self.assertEqual(chunk_request.url, self.UPLOAD_URL) @@ -1411,7 +1411,7 @@ def test_stream_file_already_complete_w_unseekable_stream(self): upload._initialize(http, _Request.URL) upload._final_response = response upload._complete = True - self.assertTrue(upload.stream_file() is response) + self.assertIs(upload.stream_file(), response) def test_stream_file_already_complete_w_seekable_stream_unsynced(self): from google.cloud.streaming.exceptions import CommunicationError @@ -1443,7 +1443,7 @@ def test_stream_file_already_complete_wo_seekable_method_synced(self): upload._initialize(http, _Request.URL) upload._final_response = response upload._complete = True - self.assertTrue(upload.stream_file(use_chunks=False) is response) + self.assertIs(upload.stream_file(use_chunks=False), response) def test_stream_file_already_complete_w_seekable_method_true_synced(self): import os @@ -1459,7 +1459,7 @@ def test_stream_file_already_complete_w_seekable_method_true_synced(self): upload._initialize(http, _Request.URL) upload._final_response = response upload._complete = True - self.assertTrue(upload.stream_file(use_chunks=False) is response) + self.assertIs(upload.stream_file(use_chunks=False), response) def test_stream_file_already_complete_w_seekable_method_false(self): import os @@ -1475,7 +1475,7 @@ def test_stream_file_already_complete_w_seekable_method_false(self): upload._initialize(http, _Request.URL) upload._final_response = response upload._complete = True - self.assertTrue(upload.stream_file(use_chunks=False) is response) + self.assertIs(upload.stream_file(use_chunks=False), response) def test_stream_file_incomplete(self): from six.moves import http_client @@ -1502,7 +1502,7 @@ def test_stream_file_incomplete(self): make_api_request=requester): response = upload.stream_file() - self.assertTrue(response is response_2) + self.assertIs(response, response_2) self.assertEqual(len(requester._responses), 0) self.assertEqual(len(requester._requested), 2) @@ -1583,8 +1583,8 @@ def test__send_media_request_wo_error(self): self.assertEqual(len(requester._responses), 0) self.assertEqual(len(requester._requested), 1) used_request, used_http, _ = requester._requested[0] - self.assertTrue(used_request is request) - self.assertTrue(used_http is bytes_http) + self.assertIs(used_request, request) + self.assertIs(used_http, bytes_http) self.assertEqual(stream.tell(), 4) def test__send_media_request_w_error(self): @@ -1619,14 +1619,14 @@ def test__send_media_request_w_error(self): self.assertEqual(len(requester._responses), 0) self.assertEqual(len(requester._requested), 2) first_request, first_http, _ = requester._requested[0] - self.assertTrue(first_request is request) - self.assertTrue(first_http is bytes_http) + self.assertIs(first_request, request) + self.assertIs(first_http, bytes_http) second_request, second_http, _ = requester._requested[1] self.assertEqual(second_request.url, self.UPLOAD_URL) self.assertEqual(second_request.http_method, 'PUT') # ACK! self.assertEqual(second_request.headers, {'Content-Range': 'bytes */*'}) - self.assertTrue(second_http is http) + self.assertIs(second_http, http) def test__send_media_body_not_initialized(self): from google.cloud.streaming.exceptions import TransferInvalidError @@ -1655,13 +1655,13 @@ def test__send_media_body_start_lt_total_size(self): found = upload._send_media_body(0) - self.assertTrue(found is response) + self.assertIs(found, response) request, end = streamer._called_with self.assertEqual(request.url, self.UPLOAD_URL) self.assertEqual(request.http_method, 'PUT') body_stream = request.body self.assertIsInstance(body_stream, StreamSlice) - self.assertTrue(body_stream._stream is stream) + self.assertIs(body_stream._stream, stream) self.assertEqual(len(body_stream), SIZE) self.assertEqual(request.headers, {'content-length': '%d' % (SIZE,), # speling! @@ -1682,13 +1682,13 @@ def test__send_media_body_start_eq_total_size(self): found = upload._send_media_body(SIZE) - self.assertTrue(found is response) + self.assertIs(found, response) request, end = streamer._called_with self.assertEqual(request.url, self.UPLOAD_URL) self.assertEqual(request.http_method, 'PUT') body_stream = request.body self.assertIsInstance(body_stream, StreamSlice) - self.assertTrue(body_stream._stream is stream) + self.assertIs(body_stream._stream, stream) self.assertEqual(len(body_stream), 0) self.assertEqual(request.headers, {'content-length': '0', # speling! @@ -1715,7 +1715,7 @@ def test__send_chunk_wo_total_size_stream_exhausted(self): found = upload._send_chunk(0) - self.assertTrue(found is response) + self.assertIs(found, response) self.assertEqual(upload.total_size, SIZE) request, end = streamer._called_with self.assertEqual(request.url, self.UPLOAD_URL) @@ -1741,7 +1741,7 @@ def test__send_chunk_wo_total_size_stream_not_exhausted(self): found = upload._send_chunk(0) - self.assertTrue(found is response) + self.assertIs(found, response) self.assertEqual(upload.total_size, None) request, end = streamer._called_with self.assertEqual(request.url, self.UPLOAD_URL) @@ -1770,13 +1770,13 @@ def test__send_chunk_w_total_size_stream_not_exhausted(self): found = upload._send_chunk(0) - self.assertTrue(found is response) + self.assertIs(found, response) request, end = streamer._called_with self.assertEqual(request.url, self.UPLOAD_URL) self.assertEqual(request.http_method, 'PUT') body_stream = request.body self.assertIsInstance(body_stream, StreamSlice) - self.assertTrue(body_stream._stream is stream) + self.assertIs(body_stream._stream, stream) self.assertEqual(len(body_stream), CHUNK_SIZE) expected_headers = { 'content-length': '%d' % CHUNK_SIZE, # speling! @@ -1801,13 +1801,13 @@ def test__send_chunk_w_total_size_stream_exhausted(self): found = upload._send_chunk(SIZE) - self.assertTrue(found is response) + self.assertIs(found, response) request, end = streamer._called_with self.assertEqual(request.url, self.UPLOAD_URL) self.assertEqual(request.http_method, 'PUT') body_stream = request.body self.assertIsInstance(body_stream, StreamSlice) - self.assertTrue(body_stream._stream is stream) + self.assertIs(body_stream._stream, stream) self.assertEqual(len(body_stream), 0) self.assertEqual(request.headers, {'content-length': '0', # speling! diff --git a/unit_tests/test__helpers.py b/unit_tests/test__helpers.py index 21ea48a58107..6b0c83e3b43c 100644 --- a/unit_tests/test__helpers.py +++ b/unit_tests/test__helpers.py @@ -32,12 +32,12 @@ def test_it(self): self.assertEqual(list(batches), []) self.assertIsNone(batches.top) batches.push(batch1) - self.assertTrue(batches.top is batch1) + self.assertIs(batches.top, batch1) batches.push(batch2) - self.assertTrue(batches.top is batch2) + self.assertIs(batches.top, batch2) popped = batches.pop() - self.assertTrue(popped is batch2) - self.assertTrue(batches.top is batch1) + self.assertIs(popped, batch2) + self.assertIs(batches.top, batch1) self.assertEqual(list(batches), [batch1]) popped = batches.pop() self.assertIsNone(batches.top) @@ -963,7 +963,7 @@ def mock_plugin(*args): result = self._callFUT(credentials, user_agent, mock_stub_class, host) - self.assertTrue(result is mock_result) + self.assertIs(result, mock_result) self.assertEqual(stub_inputs, [CHANNEL]) self.assertEqual(plugin_args, [(credentials,)]) self.assertEqual(grpc_mod.ssl_channel_credentials_args, ()) @@ -1010,7 +1010,7 @@ def mock_stub_class(channel): with _Monkey(MUT, grpc=grpc_mod): result = self._callFUT(mock_stub_class, host, port=port) - self.assertTrue(result is mock_result) + self.assertIs(result, mock_result) self.assertEqual(stub_inputs, [CHANNEL]) self.assertEqual(grpc_mod.insecure_channel_args, (target,)) diff --git a/unit_tests/test_client.py b/unit_tests/test_client.py index b748314a90ca..b22abea0fe15 100644 --- a/unit_tests/test_client.py +++ b/unit_tests/test_client.py @@ -59,7 +59,7 @@ def mock_get_credentials(): client_obj = self._makeOne() self.assertIsInstance(client_obj.connection, _MockConnection) - self.assertTrue(client_obj.connection.credentials is CREDENTIALS) + self.assertIs(client_obj.connection.credentials, CREDENTIALS) self.assertEqual(FUNC_CALLS, ['get_credentials']) def test_ctor_explicit(self): @@ -68,8 +68,8 @@ def test_ctor_explicit(self): client_obj = self._makeOne(credentials=CREDENTIALS, http=HTTP) self.assertIsInstance(client_obj.connection, _MockConnection) - self.assertTrue(client_obj.connection.credentials is CREDENTIALS) - self.assertTrue(client_obj.connection.http is HTTP) + self.assertIs(client_obj.connection.credentials, CREDENTIALS) + self.assertIs(client_obj.connection.http, HTTP) def test_from_service_account_json(self): from unit_tests._testing import _Monkey @@ -155,7 +155,7 @@ def mock_get_credentials(): self.assertEqual(client_obj.project, PROJECT) self.assertIsInstance(client_obj.connection, _MockConnection) - self.assertTrue(client_obj.connection.credentials is CREDENTIALS) + self.assertIs(client_obj.connection.credentials, CREDENTIALS) self.assertEqual( FUNC_CALLS, [(None, '_determine_default_project'), 'get_credentials']) @@ -195,8 +195,8 @@ def _explicit_ctor_helper(self, project): else: self.assertEqual(client_obj.project, project) self.assertIsInstance(client_obj.connection, _MockConnection) - self.assertTrue(client_obj.connection.credentials is CREDENTIALS) - self.assertTrue(client_obj.connection.http is HTTP) + self.assertIs(client_obj.connection.credentials, CREDENTIALS) + self.assertIs(client_obj.connection.http, HTTP) def test_ctor_explicit_bytes(self): PROJECT = b'PROJECT' diff --git a/unit_tests/test_connection.py b/unit_tests/test_connection.py index 148620af018b..e252f47d6b39 100644 --- a/unit_tests/test_connection.py +++ b/unit_tests/test_connection.py @@ -33,25 +33,25 @@ def test_ctor_explicit(self): self.assertEqual(credentials._create_scoped_calls, 0) conn = self._makeOne(credentials) self.assertEqual(credentials._create_scoped_calls, 1) - self.assertTrue(conn.credentials is credentials) + self.assertIs(conn.credentials, credentials) self.assertEqual(conn._http, None) def test_ctor_explicit_http(self): http = object() conn = self._makeOne(http=http) self.assertEqual(conn.credentials, None) - self.assertTrue(conn.http is http) + self.assertIs(conn.http, http) def test_ctor_credentials_wo_create_scoped(self): credentials = object() conn = self._makeOne(credentials) - self.assertTrue(conn.credentials is credentials) + self.assertIs(conn.credentials, credentials) self.assertEqual(conn._http, None) def test_http_w_existing(self): conn = self._makeOne() conn._http = http = object() - self.assertTrue(conn.http is http) + self.assertIs(conn.http, http) def test_http_wo_creds(self): import httplib2 @@ -64,7 +64,7 @@ def test_http_w_creds(self): authorized = object() credentials = _Credentials(authorized) conn = self._makeOne(credentials) - self.assertTrue(conn.http is authorized) + self.assertIs(conn.http, authorized) self.assertIsInstance(credentials._called_with, httplib2.Http) def test_user_agent_format(self): @@ -104,12 +104,12 @@ def test_ctor_defaults(self): def test_ctor_explicit(self): credentials = _Credentials() conn = self._makeOne(credentials) - self.assertTrue(conn.credentials is credentials) + self.assertIs(conn.credentials, credentials) def test_http_w_existing(self): conn = self._makeOne() conn._http = http = object() - self.assertTrue(conn.http is http) + self.assertIs(conn.http, http) def test_http_wo_creds(self): import httplib2 @@ -122,7 +122,7 @@ def test_http_w_creds(self): authorized = object() credentials = _Credentials(authorized) conn = self._makeOne(credentials) - self.assertTrue(conn.http is authorized) + self.assertIs(conn.http, authorized) self.assertIsInstance(credentials._called_with, httplib2.Http) def test_build_api_url_no_extra_query_params(self): diff --git a/unit_tests/test_credentials.py b/unit_tests/test_credentials.py index 5f1f2ea03d7d..e5be1cfc9618 100644 --- a/unit_tests/test_credentials.py +++ b/unit_tests/test_credentials.py @@ -29,7 +29,7 @@ def test_it(self): with _Monkey(MUT, client=client): found = self._callFUT() self.assertIsInstance(found, _Credentials) - self.assertTrue(found is client._signed) + self.assertIs(found, client._signed) self.assertTrue(client._get_app_default_called) diff --git a/unit_tests/test_iterator.py b/unit_tests/test_iterator.py index 3cc90a09bb1e..ca033aa93d2e 100644 --- a/unit_tests/test_iterator.py +++ b/unit_tests/test_iterator.py @@ -29,7 +29,7 @@ def test_ctor(self): client = _Client(connection) PATH = '/foo' iterator = self._makeOne(client, PATH) - self.assertTrue(iterator.client is client) + self.assertIs(iterator.client, client) self.assertEqual(iterator.path, PATH) self.assertEqual(iterator.page_number, 0) self.assertEqual(iterator.next_page_token, None) diff --git a/unit_tests/test_operation.py b/unit_tests/test_operation.py index 6e3e5d40cde6..f9984f9ad43c 100644 --- a/unit_tests/test_operation.py +++ b/unit_tests/test_operation.py @@ -104,7 +104,7 @@ def test_ctor_defaults(self): operation = self._makeOne( self.OPERATION_NAME, client) self.assertEqual(operation.name, self.OPERATION_NAME) - self.assertTrue(operation.client is client) + self.assertIs(operation.client, client) self.assertIsNone(operation.target) self.assertIsNone(operation.pb_metadata) self.assertEqual(operation.metadata, {}) @@ -115,9 +115,9 @@ def test_ctor_explicit(self): operation = self._makeOne( self.OPERATION_NAME, client, pb_metadata, foo='bar') self.assertEqual(operation.name, self.OPERATION_NAME) - self.assertTrue(operation.client is client) + self.assertIs(operation.client, client) self.assertIsNone(operation.target) - self.assertTrue(operation.pb_metadata is pb_metadata) + self.assertIs(operation.pb_metadata, pb_metadata) self.assertEqual(operation.metadata, {'foo': 'bar'}) def test_from_pb_wo_metadata_or_kw(self): @@ -129,7 +129,7 @@ def test_from_pb_wo_metadata_or_kw(self): operation = klass.from_pb(operation_pb, client) self.assertEqual(operation.name, self.OPERATION_NAME) - self.assertTrue(operation.client is client) + self.assertIs(operation.client, client) self.assertIsNone(operation.pb_metadata) self.assertEqual(operation.metadata, {}) @@ -149,7 +149,7 @@ def test_from_pb_w_unknown_metadata(self): operation = klass.from_pb(operation_pb, client) self.assertEqual(operation.name, self.OPERATION_NAME) - self.assertTrue(operation.client is client) + self.assertIs(operation.client, client) self.assertIsNone(operation.pb_metadata) self.assertEqual(operation.metadata, {}) @@ -173,7 +173,7 @@ def test_from_pb_w_metadata_and_kwargs(self): operation = klass.from_pb(operation_pb, client, baz='qux') self.assertEqual(operation.name, self.OPERATION_NAME) - self.assertTrue(operation.client is client) + self.assertIs(operation.client, client) pb_metadata = operation.pb_metadata self.assertIsInstance(pb_metadata, Struct) self.assertEqual(list(pb_metadata.fields), ['foo']) diff --git a/unit_tests/translate/test_client.py b/unit_tests/translate/test_client.py index 684d23f5ba2e..a32c74b6368b 100644 --- a/unit_tests/translate/test_client.py +++ b/unit_tests/translate/test_client.py @@ -34,7 +34,7 @@ def test_ctor(self): client = self._makeOne(self.KEY, http=http) self.assertIsInstance(client.connection, Connection) self.assertIsNone(client.connection.credentials) - self.assertTrue(client.connection.http is http) + self.assertIs(client.connection.http, http) self.assertEqual(client.target_language, ENGLISH_ISO_639) def test_ctor_non_default(self): @@ -45,7 +45,7 @@ def test_ctor_non_default(self): client = self._makeOne(self.KEY, http=http, target_language=target) self.assertIsInstance(client.connection, Connection) self.assertIsNone(client.connection.credentials) - self.assertTrue(client.connection.http is http) + self.assertIs(client.connection.http, http) self.assertEqual(client.target_language, target) def test_get_languages(self): From d07db3c445dd5de4399815df8800bd885ac2d2fe Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 20 Sep 2016 11:20:07 -0700 Subject: [PATCH 5/9] Replacing assertFalse(... is ...) with assertIsNot(..., ...). Did this using: https://gist.github.com/dhermes/ecaff881be516f737e5abdde37acf3e2 --- unit_tests/bigtable/test_cluster.py | 4 ++-- unit_tests/bigtable/test_instance.py | 4 ++-- unit_tests/bigtable/test_row_data.py | 2 +- unit_tests/datastore/test_client.py | 4 ++-- unit_tests/datastore/test_key.py | 4 ++-- unit_tests/storage/test_acl.py | 2 +- unit_tests/storage/test_bucket.py | 4 ++-- unit_tests/streaming/test_transfer.py | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/unit_tests/bigtable/test_cluster.py b/unit_tests/bigtable/test_cluster.py index 0587113eb39a..8712abf52e99 100644 --- a/unit_tests/bigtable/test_cluster.py +++ b/unit_tests/bigtable/test_cluster.py @@ -63,10 +63,10 @@ def test_copy(self): new_cluster = cluster.copy() # Make sure the client copy succeeded. - self.assertFalse(new_cluster._instance is instance) + self.assertIsNot(new_cluster._instance, instance) self.assertEqual(new_cluster.serve_nodes, SERVE_NODES) # Make sure the client got copied to a new instance. - self.assertFalse(cluster is new_cluster) + self.assertIsNot(cluster, new_cluster) self.assertEqual(cluster, new_cluster) def test__update_from_pb_success(self): diff --git a/unit_tests/bigtable/test_instance.py b/unit_tests/bigtable/test_instance.py index 5a65292a0ad7..0b5f8a81558b 100644 --- a/unit_tests/bigtable/test_instance.py +++ b/unit_tests/bigtable/test_instance.py @@ -67,10 +67,10 @@ def test_copy(self): new_instance = instance.copy() # Make sure the client copy succeeded. - self.assertFalse(new_instance._client is client) + self.assertIsNot(new_instance._client, client) self.assertEqual(new_instance._client, client) # Make sure the client got copied to a new instance. - self.assertFalse(instance is new_instance) + self.assertIsNot(instance, new_instance) self.assertEqual(instance, new_instance) def test_table_factory(self): diff --git a/unit_tests/bigtable/test_row_data.py b/unit_tests/bigtable/test_row_data.py index eef454e43c37..3f1da346b41f 100644 --- a/unit_tests/bigtable/test_row_data.py +++ b/unit_tests/bigtable/test_row_data.py @@ -173,7 +173,7 @@ def test_cells_property(self): cells = {1: 2} partial_row_data._cells = cells # Make sure we get a copy, not the original. - self.assertFalse(partial_row_data.cells is cells) + self.assertIsNot(partial_row_data.cells, cells) self.assertEqual(partial_row_data.cells, cells) def test_row_key_getter(self): diff --git a/unit_tests/datastore/test_client.py b/unit_tests/datastore/test_client.py index 95955b59e1b3..059367527808 100644 --- a/unit_tests/datastore/test_client.py +++ b/unit_tests/datastore/test_client.py @@ -409,7 +409,7 @@ def test_get_multi_hit(self): new_key = result.key # Check the returned value is as expected. - self.assertFalse(new_key is key) + self.assertIsNot(new_key, key) self.assertEqual(new_key.project, self.PROJECT) self.assertEqual(new_key.path, PATH) self.assertEqual(list(result), ['foo']) @@ -438,7 +438,7 @@ def test_get_multi_hit_w_transaction(self): new_key = result.key # Check the returned value is as expected. - self.assertFalse(new_key is key) + self.assertIsNot(new_key, key) self.assertEqual(new_key.project, self.PROJECT) self.assertEqual(new_key.path, PATH) self.assertEqual(list(result), ['foo']) diff --git a/unit_tests/datastore/test_key.py b/unit_tests/datastore/test_key.py index 36352a3aa4f1..46d7418202a2 100644 --- a/unit_tests/datastore/test_key.py +++ b/unit_tests/datastore/test_key.py @@ -292,7 +292,7 @@ def test_completed_key_on_partial_w_id(self): key = self._makeOne('KIND', project=self._DEFAULT_PROJECT) _ID = 1234 new_key = key.completed_key(_ID) - self.assertFalse(key is new_key) + self.assertIsNot(key, new_key) self.assertEqual(new_key.id, _ID) self.assertEqual(new_key.name, None) @@ -300,7 +300,7 @@ def test_completed_key_on_partial_w_name(self): key = self._makeOne('KIND', project=self._DEFAULT_PROJECT) _NAME = 'NAME' new_key = key.completed_key(_NAME) - self.assertFalse(key is new_key) + self.assertIsNot(key, new_key) self.assertEqual(new_key.id, None) self.assertEqual(new_key.name, _NAME) diff --git a/unit_tests/storage/test_acl.py b/unit_tests/storage/test_acl.py index 5a6844863710..4efcdc6e62e7 100644 --- a/unit_tests/storage/test_acl.py +++ b/unit_tests/storage/test_acl.py @@ -395,7 +395,7 @@ def test_add_entity_hit(self): before = acl.entity(TYPE, ID) acl.add_entity(entity) self.assertTrue(acl.loaded) - self.assertFalse(acl.get_entity(ENTITY_VAL) is before) + self.assertIsNot(acl.get_entity(ENTITY_VAL), before) self.assertIs(acl.get_entity(ENTITY_VAL), entity) self.assertEqual(list(acl), [{'entity': 'type-id', 'role': ROLE}]) diff --git a/unit_tests/storage/test_bucket.py b/unit_tests/storage/test_bucket.py index cfb3809ceeb0..caf46c3c60c3 100644 --- a/unit_tests/storage/test_bucket.py +++ b/unit_tests/storage/test_bucket.py @@ -618,7 +618,7 @@ def test_lifecycle_rules_getter(self): bucket = self._makeOne(name=NAME, properties=properties) self.assertEqual(bucket.lifecycle_rules, rules) # Make sure it's a copy - self.assertFalse(bucket.lifecycle_rules is rules) + self.assertIsNot(bucket.lifecycle_rules, rules) def test_lifecycle_rules_setter(self): NAME = 'name' @@ -645,7 +645,7 @@ def test_cors_getter(self): self.assertEqual(entries[0], CORS_ENTRY) self.assertEqual(entries[1], {}) # Make sure it was a copy, not the same object. - self.assertFalse(entries[0] is CORS_ENTRY) + self.assertIsNot(entries[0], CORS_ENTRY) def test_cors_setter(self): NAME = 'name' diff --git a/unit_tests/streaming/test_transfer.py b/unit_tests/streaming/test_transfer.py index 01502013651c..b198b9e6e39a 100644 --- a/unit_tests/streaming/test_transfer.py +++ b/unit_tests/streaming/test_transfer.py @@ -1201,7 +1201,7 @@ def test_refresh_upload_state_w_RESUME_INCOMPLETE_w_range(self): self.assertFalse(upload.complete) self.assertEqual(upload.progress, LAST) self.assertEqual(stream.tell(), LAST) - self.assertFalse(upload._final_response is response) + self.assertIsNot(upload._final_response, response) def test_refresh_upload_state_w_RESUME_INCOMPLETE_wo_range(self): from google.cloud.streaming import transfer as MUT @@ -1226,7 +1226,7 @@ def test_refresh_upload_state_w_RESUME_INCOMPLETE_wo_range(self): self.assertFalse(upload.complete) self.assertEqual(upload.progress, 0) self.assertEqual(stream.tell(), 0) - self.assertFalse(upload._final_response is response) + self.assertIsNot(upload._final_response, response) def test_refresh_upload_state_w_error(self): from six.moves import http_client From 24aa6e718a238a324bd6be288cd4f47bf5f5fd48 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 20 Sep 2016 11:24:33 -0700 Subject: [PATCH 6/9] Replacing remaining assertTrue(... is ...) with assertIs(..., ...). Done manually by checking the output of: $ git grep ' is$' -- unit_tests/ $ git grep ' is$' -- system_tests/ $ git grep ' is ' -- unit_tests/ $ git grep ' is ' -- system_tests/ --- unit_tests/bigtable/test_row_data.py | 4 ++-- unit_tests/test_client.py | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/unit_tests/bigtable/test_row_data.py b/unit_tests/bigtable/test_row_data.py index 3f1da346b41f..7c3867c4861f 100644 --- a/unit_tests/bigtable/test_row_data.py +++ b/unit_tests/bigtable/test_row_data.py @@ -210,8 +210,8 @@ def _makeOne(self, *args, **kwargs): def test_constructor(self): response_iterator = object() partial_rows_data = self._makeOne(response_iterator) - self.assertTrue(partial_rows_data._response_iterator - is response_iterator) + self.assertIs(partial_rows_data._response_iterator, + response_iterator) self.assertEqual(partial_rows_data._rows, {}) def test___eq__(self): diff --git a/unit_tests/test_client.py b/unit_tests/test_client.py index b22abea0fe15..52bfc4aede9c 100644 --- a/unit_tests/test_client.py +++ b/unit_tests/test_client.py @@ -81,8 +81,7 @@ def test_from_service_account_json(self): with _Monkey(client, ServiceAccountCredentials=mock_creds): client_obj = KLASS.from_service_account_json(MOCK_FILENAME) - self.assertTrue(client_obj.connection.credentials is - mock_creds._result) + self.assertIs(client_obj.connection.credentials, mock_creds._result) self.assertEqual(mock_creds.json_called, [MOCK_FILENAME]) def test_from_service_account_json_fail(self): @@ -103,8 +102,7 @@ def test_from_service_account_p12(self): client_obj = KLASS.from_service_account_p12(CLIENT_EMAIL, MOCK_FILENAME) - self.assertTrue(client_obj.connection.credentials is - mock_creds._result) + self.assertIs(client_obj.connection.credentials, mock_creds._result) self.assertEqual(mock_creds.p12_called, [(CLIENT_EMAIL, MOCK_FILENAME)]) From 3f0635035a5569d1a700fce401eca33c199991e6 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 20 Sep 2016 11:37:43 -0700 Subject: [PATCH 7/9] Manually fixing some asserts broken by the auto scripts. --- unit_tests/storage/test_bucket.py | 2 +- unit_tests/storage/test_client.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/unit_tests/storage/test_bucket.py b/unit_tests/storage/test_bucket.py index caf46c3c60c3..0e4f1e5d11bc 100644 --- a/unit_tests/storage/test_bucket.py +++ b/unit_tests/storage/test_bucket.py @@ -704,7 +704,7 @@ def test_disable_logging(self): NAME = 'name' before = {'logging': {'logBucket': 'logs', 'logObjectPrefix': 'pfx'}} bucket = self._makeOne(name=NAME, properties=before) - self.assertIs(bucket.get_logging(), not None) + self.assertIsNotNone(bucket.get_logging()) bucket.disable_logging() self.assertIsNone(bucket.get_logging()) diff --git a/unit_tests/storage/test_client.py b/unit_tests/storage/test_client.py index c8d30dc4c65c..7eec3b2e2e35 100644 --- a/unit_tests/storage/test_client.py +++ b/unit_tests/storage/test_client.py @@ -86,7 +86,7 @@ def test_connection_getter_with_batch(self): client = self._makeOne(project=PROJECT, credentials=CREDENTIALS) batch = Batch(client) client._push_batch(batch) - self.assertIs(client.connection, not client._connection) + self.assertIsNot(client.connection, client._connection) self.assertIs(client.connection, batch) self.assertIs(client.current_batch, batch) From 2c273f0223ada09170c97a5541894d6bb3f59f02 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 20 Sep 2016 11:50:40 -0700 Subject: [PATCH 8/9] Replacing assertEqual(..., None) with assertIsNone(...). Did this using: https://gist.github.com/dhermes/f4176452c2436b14e0c97a114d98bace Also had to manually undo a few of the changes since the regex matched things like self.assertEqual(foo, [(value, has_some, parens, None)]) --- system_tests/bigquery.py | 10 +-- system_tests/bigtable.py | 2 +- system_tests/datastore.py | 2 +- unit_tests/bigquery/test__helpers.py | 14 ++-- unit_tests/bigquery/test_client.py | 8 +-- unit_tests/bigquery/test_dataset.py | 32 ++++----- unit_tests/bigquery/test_job.py | 46 ++++++------- unit_tests/bigquery/test_query.py | 2 +- unit_tests/bigquery/test_schema.py | 16 ++--- unit_tests/bigquery/test_table.py | 74 ++++++++++----------- unit_tests/bigtable/test_column_family.py | 2 +- unit_tests/bigtable/test_instance.py | 6 +- unit_tests/bigtable/test_row.py | 4 +- unit_tests/bigtable/test_row_filters.py | 8 +-- unit_tests/datastore/test_client.py | 18 ++--- unit_tests/datastore/test_connection.py | 8 +-- unit_tests/datastore/test_entity.py | 4 +- unit_tests/datastore/test_helpers.py | 12 ++-- unit_tests/datastore/test_key.py | 12 ++-- unit_tests/datastore/test_query.py | 22 +++--- unit_tests/datastore/test_transaction.py | 18 ++--- unit_tests/dns/test_changes.py | 6 +- unit_tests/dns/test_client.py | 6 +- unit_tests/dns/test_zone.py | 24 +++---- unit_tests/logging/test__gax.py | 48 ++++++------- unit_tests/logging/test_client.py | 12 ++-- unit_tests/logging/test_connection.py | 6 +- unit_tests/logging/test_logger.py | 6 +- unit_tests/logging/test_metric.py | 2 +- unit_tests/logging/test_sink.py | 4 +- unit_tests/pubsub/test__gax.py | 68 +++++++++---------- unit_tests/pubsub/test_client.py | 8 +-- unit_tests/pubsub/test_connection.py | 12 ++-- unit_tests/pubsub/test_iam.py | 6 +- unit_tests/pubsub/test_message.py | 6 +- unit_tests/pubsub/test_subscription.py | 14 ++-- unit_tests/pubsub/test_topic.py | 8 +-- unit_tests/resource_manager/test_client.py | 2 +- unit_tests/resource_manager/test_project.py | 18 ++--- unit_tests/storage/test_acl.py | 16 ++--- unit_tests/storage/test_batch.py | 4 +- unit_tests/storage/test_blob.py | 36 +++++----- unit_tests/storage/test_bucket.py | 10 +-- unit_tests/storage/test_client.py | 8 +-- unit_tests/streaming/test_http_wrapper.py | 6 +- unit_tests/streaming/test_transfer.py | 16 ++--- unit_tests/test__helpers.py | 14 ++-- unit_tests/test_connection.py | 20 +++--- unit_tests/test_iterator.py | 16 ++--- 49 files changed, 361 insertions(+), 361 deletions(-) diff --git a/system_tests/bigquery.py b/system_tests/bigquery.py index e55f19fc3f71..c417e0538b54 100644 --- a/system_tests/bigquery.py +++ b/system_tests/bigquery.py @@ -113,8 +113,8 @@ def test_patch_dataset(self): self.to_delete.append(dataset) self.assertTrue(dataset.exists()) - self.assertEqual(dataset.friendly_name, None) - self.assertEqual(dataset.description, None) + self.assertIsNone(dataset.friendly_name) + self.assertIsNone(dataset.description) dataset.patch(friendly_name='Friendly', description='Description') self.assertEqual(dataset.friendly_name, 'Friendly') self.assertEqual(dataset.description, 'Description') @@ -187,7 +187,7 @@ def test_list_tables(self): # Retrieve tables before any are created for the dataset. all_tables, token = dataset.list_tables() self.assertEqual(all_tables, []) - self.assertEqual(token, None) + self.assertIsNone(token) # Insert some tables to be listed. tables_to_create = [ @@ -227,8 +227,8 @@ def test_patch_table(self): table.create() self.to_delete.insert(0, table) self.assertTrue(table.exists()) - self.assertEqual(table.friendly_name, None) - self.assertEqual(table.description, None) + self.assertIsNone(table.friendly_name) + self.assertIsNone(table.description) table.patch(friendly_name='Friendly', description='Description') self.assertEqual(table.friendly_name, 'Friendly') self.assertEqual(table.description, 'Description') diff --git a/system_tests/bigtable.py b/system_tests/bigtable.py index 48688d1a6e25..5a19175266ce 100644 --- a/system_tests/bigtable.py +++ b/system_tests/bigtable.py @@ -257,7 +257,7 @@ def test_update_column_family(self): # Check that the update has propagated. col_fams = temp_table.list_column_families() - self.assertEqual(col_fams[COLUMN_FAMILY_ID1].gc_rule, None) + self.assertIsNone(col_fams[COLUMN_FAMILY_ID1].gc_rule) def test_delete_column_family(self): temp_table_id = 'foo-bar-baz-table' diff --git a/system_tests/datastore.py b/system_tests/datastore.py index df084e1412a2..97f757abf59d 100644 --- a/system_tests/datastore.py +++ b/system_tests/datastore.py @@ -85,7 +85,7 @@ def test_allocate_ids(self): unique_ids = set() for key in allocated_keys: unique_ids.add(key.id) - self.assertEqual(key.name, None) + self.assertIsNone(key.name) self.assertNotEqual(key.id, None) self.assertEqual(len(unique_ids), num_ids) diff --git a/unit_tests/bigquery/test__helpers.py b/unit_tests/bigquery/test__helpers.py index 8cb2a3d1389a..d86504feb372 100644 --- a/unit_tests/bigquery/test__helpers.py +++ b/unit_tests/bigquery/test__helpers.py @@ -339,7 +339,7 @@ def __init__(self): self.assertEqual(Wrapper.attr.name, 'attr') wrapper = Wrapper() - self.assertEqual(wrapper.attr, None) + self.assertIsNone(wrapper.attr) value = object() wrapper.attr = value @@ -347,8 +347,8 @@ def __init__(self): self.assertIs(wrapper._configuration._attr, value) del wrapper.attr - self.assertEqual(wrapper.attr, None) - self.assertEqual(wrapper._configuration._attr, None) + self.assertIsNone(wrapper.attr) + self.assertIsNone(wrapper._configuration._attr) class Test_TypedProperty(unittest.TestCase): @@ -380,8 +380,8 @@ def __init__(self): self.assertEqual(wrapper._configuration._attr, 42) del wrapper.attr - self.assertEqual(wrapper.attr, None) - self.assertEqual(wrapper._configuration._attr, None) + self.assertIsNone(wrapper.attr) + self.assertIsNone(wrapper._configuration._attr) class Test_EnumProperty(unittest.TestCase): @@ -413,8 +413,8 @@ def __init__(self): self.assertEqual(wrapper._configuration._attr, 'FOO') del wrapper.attr - self.assertEqual(wrapper.attr, None) - self.assertEqual(wrapper._configuration._attr, None) + self.assertIsNone(wrapper.attr) + self.assertIsNone(wrapper._configuration._attr) class Test_UDFResourcesProperty(unittest.TestCase): diff --git a/unit_tests/bigquery/test_client.py b/unit_tests/bigquery/test_client.py index e72f24e1230e..e599217b92e2 100644 --- a/unit_tests/bigquery/test_client.py +++ b/unit_tests/bigquery/test_client.py @@ -86,7 +86,7 @@ def test_list_projects_explicit_response_missing_projects_key(self): projects, token = client.list_projects(max_results=3, page_token=TOKEN) self.assertEqual(len(projects), 0) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(len(conn._requested), 1) req = conn._requested[0] @@ -148,7 +148,7 @@ def test_list_datasets_explicit_response_missing_datasets_key(self): include_all=True, max_results=3, page_token=TOKEN) self.assertEqual(len(datasets), 0) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(len(conn._requested), 1) req = conn._requested[0] @@ -368,7 +368,7 @@ def test_list_jobs_explicit_missing(self): all_users=True, state_filter='done') self.assertEqual(len(jobs), 0) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(len(conn._requested), 1) req = conn._requested[0] @@ -463,7 +463,7 @@ def test_run_sync_query(self): job = client.run_sync_query(QUERY) self.assertIsInstance(job, QueryResults) self.assertIs(job._client, client) - self.assertEqual(job.name, None) + self.assertIsNone(job.name) self.assertEqual(job.query, QUERY) diff --git a/unit_tests/bigquery/test_dataset.py b/unit_tests/bigquery/test_dataset.py index ab0d761363b7..6d6c00df610c 100644 --- a/unit_tests/bigquery/test_dataset.py +++ b/unit_tests/bigquery/test_dataset.py @@ -140,19 +140,19 @@ def _verifyReadonlyResourceProperties(self, dataset, resource): if 'creationTime' in resource: self.assertEqual(dataset.created, self.WHEN) else: - self.assertEqual(dataset.created, None) + self.assertIsNone(dataset.created) if 'etag' in resource: self.assertEqual(dataset.etag, self.ETAG) else: - self.assertEqual(dataset.etag, None) + self.assertIsNone(dataset.etag) if 'lastModifiedTime' in resource: self.assertEqual(dataset.modified, self.WHEN) else: - self.assertEqual(dataset.modified, None) + self.assertIsNone(dataset.modified) if 'selfLink' in resource: self.assertEqual(dataset.self_link, self.RESOURCE_URL) else: - self.assertEqual(dataset.self_link, None) + self.assertIsNone(dataset.self_link) def _verifyResourceProperties(self, dataset, resource): @@ -162,7 +162,7 @@ def _verifyResourceProperties(self, dataset, resource): self.assertEqual(dataset.default_table_expiration_ms, int(resource.get('defaultTableExpirationMs'))) else: - self.assertEqual(dataset.default_table_expiration_ms, None) + self.assertIsNone(dataset.default_table_expiration_ms) self.assertEqual(dataset.description, resource.get('description')) self.assertEqual(dataset.friendly_name, resource.get('friendlyName')) self.assertEqual(dataset.location, resource.get('location')) @@ -183,16 +183,16 @@ def test_ctor(self): '/projects/%s/datasets/%s' % (self.PROJECT, self.DS_NAME)) self.assertEqual(dataset.access_grants, []) - self.assertEqual(dataset.created, None) - self.assertEqual(dataset.dataset_id, None) - self.assertEqual(dataset.etag, None) - self.assertEqual(dataset.modified, None) - self.assertEqual(dataset.self_link, None) + self.assertIsNone(dataset.created) + self.assertIsNone(dataset.dataset_id) + self.assertIsNone(dataset.etag) + self.assertIsNone(dataset.modified) + self.assertIsNone(dataset.self_link) - self.assertEqual(dataset.default_table_expiration_ms, None) - self.assertEqual(dataset.description, None) - self.assertEqual(dataset.friendly_name, None) - self.assertEqual(dataset.location, None) + self.assertIsNone(dataset.default_table_expiration_ms) + self.assertIsNone(dataset.description) + self.assertIsNone(dataset.friendly_name) + self.assertIsNone(dataset.location) def test_access_roles_setter_non_list(self): client = _Client(self.PROJECT) @@ -641,7 +641,7 @@ def test_list_tables_empty(self): dataset = self._makeOne(self.DS_NAME, client=client) tables, token = dataset.list_tables() self.assertEqual(tables, []) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(len(conn._requested), 1) req = conn._requested[0] self.assertEqual(req['method'], 'GET') @@ -726,7 +726,7 @@ def test_list_tables_explicit(self): self.assertIsInstance(found, Table) self.assertEqual(found.table_id, expected['id']) self.assertEqual(found.table_type, expected['type']) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(len(conn._requested), 1) req = conn._requested[0] diff --git a/unit_tests/bigquery/test_job.py b/unit_tests/bigquery/test_job.py index b0c8256bbddf..f4add8d8f7be 100644 --- a/unit_tests/bigquery/test_job.py +++ b/unit_tests/bigquery/test_job.py @@ -69,19 +69,19 @@ def _makeResource(self, started=False, ended=False): def _verifyInitialReadonlyProperties(self, job): # root elements of resource - self.assertEqual(job.etag, None) - self.assertEqual(job.self_link, None) - self.assertEqual(job.user_email, None) + self.assertIsNone(job.etag) + self.assertIsNone(job.self_link) + self.assertIsNone(job.user_email) # derived from resource['statistics'] - self.assertEqual(job.created, None) - self.assertEqual(job.started, None) - self.assertEqual(job.ended, None) + self.assertIsNone(job.created) + self.assertIsNone(job.started) + self.assertIsNone(job.ended) # derived from resource['status'] - self.assertEqual(job.error_result, None) - self.assertEqual(job.errors, None) - self.assertEqual(job.state, None) + self.assertIsNone(job.error_result) + self.assertIsNone(job.errors) + self.assertIsNone(job.state) def _verifyReadonlyResourceProperties(self, job, resource): from datetime import timedelta @@ -91,32 +91,32 @@ def _verifyReadonlyResourceProperties(self, job, resource): if 'creationTime' in statistics: self.assertEqual(job.created, self.WHEN) else: - self.assertEqual(job.created, None) + self.assertIsNone(job.created) if 'startTime' in statistics: self.assertEqual(job.started, self.WHEN) else: - self.assertEqual(job.started, None) + self.assertIsNone(job.started) if 'endTime' in statistics: self.assertEqual(job.ended, self.WHEN + timedelta(seconds=1000)) else: - self.assertEqual(job.ended, None) + self.assertIsNone(job.ended) if 'etag' in resource: self.assertEqual(job.etag, self.ETAG) else: - self.assertEqual(job.etag, None) + self.assertIsNone(job.etag) if 'selfLink' in resource: self.assertEqual(job.self_link, self.RESOURCE_URL) else: - self.assertEqual(job.self_link, None) + self.assertIsNone(job.self_link) if 'user_email' in resource: self.assertEqual(job.user_email, self.USER_EMAIL) else: - self.assertEqual(job.user_email, None) + self.assertIsNone(job.user_email) class TestLoadTableFromStorageJob(unittest.TestCase, _Base): @@ -243,10 +243,10 @@ def test_ctor(self): self._verifyInitialReadonlyProperties(job) # derived from resource['statistics']['load'] - self.assertEqual(job.input_file_bytes, None) - self.assertEqual(job.input_files, None) - self.assertEqual(job.output_bytes, None) - self.assertEqual(job.output_rows, None) + self.assertIsNone(job.input_file_bytes) + self.assertIsNone(job.input_files) + self.assertIsNone(job.output_bytes) + self.assertIsNone(job.output_rows) # set/read from resource['configuration']['load'] self.assertIsNone(job.allow_jagged_rows) @@ -347,9 +347,9 @@ def test_props_set_by_server(self): status = job._properties['status'] = {} - self.assertEqual(job.error_result, None) - self.assertEqual(job.errors, None) - self.assertEqual(job.state, None) + self.assertIsNone(job.error_result) + self.assertIsNone(job.errors) + self.assertIsNone(job.state) status['errorResult'] = ERROR_RESULT status['errors'] = [ERROR_RESULT] @@ -1594,7 +1594,7 @@ def test_reload_w_bound_client(self): job.reload() - self.assertEqual(job.destination, None) + self.assertIsNone(job.destination) self.assertEqual(len(conn._requested), 1) req = conn._requested[0] diff --git a/unit_tests/bigquery/test_query.py b/unit_tests/bigquery/test_query.py index 3549b1114082..244233e88343 100644 --- a/unit_tests/bigquery/test_query.py +++ b/unit_tests/bigquery/test_query.py @@ -384,7 +384,7 @@ def test_fetch_data_w_bound_client(self): self.assertEqual(rows[1], ('Bharney Rhubble', 33)) self.assertEqual(rows[2], ('Wylma Phlyntstone', 29)) self.assertEqual(rows[3], ('Bhettye Rhubble', 27)) - self.assertEqual(total_rows, None) + self.assertIsNone(total_rows) self.assertEqual(page_token, AFTER['pageToken']) self.assertEqual(len(conn._requested), 1) diff --git a/unit_tests/bigquery/test_schema.py b/unit_tests/bigquery/test_schema.py index eba85a078b81..0226de79a439 100644 --- a/unit_tests/bigquery/test_schema.py +++ b/unit_tests/bigquery/test_schema.py @@ -29,8 +29,8 @@ def test_ctor_defaults(self): self.assertEqual(field.name, 'test') self.assertEqual(field.field_type, 'STRING') self.assertEqual(field.mode, 'NULLABLE') - self.assertEqual(field.description, None) - self.assertEqual(field.fields, None) + self.assertIsNone(field.description) + self.assertIsNone(field.fields) def test_ctor_explicit(self): field = self._makeOne('test', 'STRING', mode='REQUIRED', @@ -39,7 +39,7 @@ def test_ctor_explicit(self): self.assertEqual(field.field_type, 'STRING') self.assertEqual(field.mode, 'REQUIRED') self.assertEqual(field.description, 'Testing') - self.assertEqual(field.fields, None) + self.assertIsNone(field.fields) def test_ctor_subfields(self): field = self._makeOne('phone_number', 'RECORD', @@ -48,18 +48,18 @@ def test_ctor_subfields(self): self.assertEqual(field.name, 'phone_number') self.assertEqual(field.field_type, 'RECORD') self.assertEqual(field.mode, 'NULLABLE') - self.assertEqual(field.description, None) + self.assertIsNone(field.description) self.assertEqual(len(field.fields), 2) self.assertEqual(field.fields[0].name, 'area_code') self.assertEqual(field.fields[0].field_type, 'STRING') self.assertEqual(field.fields[0].mode, 'NULLABLE') - self.assertEqual(field.fields[0].description, None) - self.assertEqual(field.fields[0].fields, None) + self.assertIsNone(field.fields[0].description) + self.assertIsNone(field.fields[0].fields) self.assertEqual(field.fields[1].name, 'local_number') self.assertEqual(field.fields[1].field_type, 'STRING') self.assertEqual(field.fields[1].mode, 'NULLABLE') - self.assertEqual(field.fields[1].description, None) - self.assertEqual(field.fields[1].fields, None) + self.assertIsNone(field.fields[1].description) + self.assertIsNone(field.fields[1].fields) def test___eq___name_mismatch(self): field = self._makeOne('test', 'STRING') diff --git a/unit_tests/bigquery/test_table.py b/unit_tests/bigquery/test_table.py index 583518c3af97..e99deb7f34d0 100644 --- a/unit_tests/bigquery/test_table.py +++ b/unit_tests/bigquery/test_table.py @@ -81,27 +81,27 @@ def _verifyReadonlyResourceProperties(self, table, resource): if 'creationTime' in resource: self.assertEqual(table.created, self.WHEN) else: - self.assertEqual(table.created, None) + self.assertIsNone(table.created) if 'etag' in resource: self.assertEqual(table.etag, self.ETAG) else: - self.assertEqual(table.etag, None) + self.assertIsNone(table.etag) if 'numRows' in resource: self.assertEqual(table.num_rows, self.NUM_ROWS) else: - self.assertEqual(table.num_rows, None) + self.assertIsNone(table.num_rows) if 'numBytes' in resource: self.assertEqual(table.num_bytes, self.NUM_BYTES) else: - self.assertEqual(table.num_bytes, None) + self.assertIsNone(table.num_bytes) if 'selfLink' in resource: self.assertEqual(table.self_link, self.RESOURCE_URL) else: - self.assertEqual(table.self_link, None) + self.assertIsNone(table.self_link) self.assertEqual(table.table_id, self.TABLE_ID) self.assertEqual(table.table_type, @@ -114,7 +114,7 @@ def _verifyResourceProperties(self, table, resource): if 'expirationTime' in resource: self.assertEqual(table.expires, self.EXP_TIME) else: - self.assertEqual(table.expires, None) + self.assertIsNone(table.expires) self.assertEqual(table.description, resource.get('description')) self.assertEqual(table.friendly_name, resource.get('friendlyName')) @@ -123,7 +123,7 @@ def _verifyResourceProperties(self, table, resource): if 'view' in resource: self.assertEqual(table.view_query, resource['view']['query']) else: - self.assertEqual(table.view_query, None) + self.assertIsNone(table.view_query) if 'schema' in resource: self._verifySchema(table.schema, resource) @@ -144,20 +144,20 @@ def test_ctor(self): self.PROJECT, self.DS_NAME, self.TABLE_NAME)) self.assertEqual(table.schema, []) - self.assertEqual(table.created, None) - self.assertEqual(table.etag, None) - self.assertEqual(table.modified, None) - self.assertEqual(table.num_bytes, None) - self.assertEqual(table.num_rows, None) - self.assertEqual(table.self_link, None) - self.assertEqual(table.table_id, None) - self.assertEqual(table.table_type, None) - - self.assertEqual(table.description, None) - self.assertEqual(table.expires, None) - self.assertEqual(table.friendly_name, None) - self.assertEqual(table.location, None) - self.assertEqual(table.view_query, None) + self.assertIsNone(table.created) + self.assertIsNone(table.etag) + self.assertIsNone(table.modified) + self.assertIsNone(table.num_bytes) + self.assertIsNone(table.num_rows) + self.assertIsNone(table.self_link) + self.assertIsNone(table.table_id) + self.assertIsNone(table.table_type) + + self.assertIsNone(table.description) + self.assertIsNone(table.expires) + self.assertIsNone(table.friendly_name) + self.assertIsNone(table.location) + self.assertIsNone(table.view_query) def test_ctor_w_schema(self): from google.cloud.bigquery.table import SchemaField @@ -175,7 +175,7 @@ def test_num_bytes_getter(self): table = self._makeOne(self.TABLE_NAME, dataset) # Check with no value set. - self.assertEqual(table.num_bytes, None) + self.assertIsNone(table.num_bytes) num_bytes = 1337 # Check with integer value set. @@ -197,7 +197,7 @@ def test_num_rows_getter(self): table = self._makeOne(self.TABLE_NAME, dataset) # Check with no value set. - self.assertEqual(table.num_rows, None) + self.assertIsNone(table.num_rows) num_rows = 42 # Check with integer value set. @@ -351,7 +351,7 @@ def test_view_query_deleter(self): table = self._makeOne(self.TABLE_NAME, dataset) table.view_query = 'select * from foo' del table.view_query - self.assertEqual(table.view_query, None) + self.assertIsNone(table.view_query) def test_from_api_repr_missing_identity(self): self._setUpConstants() @@ -441,7 +441,7 @@ def test_create_w_partition_no_expire(self): table = self._makeOne(self.TABLE_NAME, dataset, schema=[full_name, age]) - self.assertEqual(table.partitioning_type, None) + self.assertIsNone(table.partitioning_type) table.partitioning_type = "DAY" self.assertEqual(table.partitioning_type, "DAY") table.create() @@ -474,7 +474,7 @@ def test_create_w_partition_and_expire(self): age = SchemaField('age', 'INTEGER', mode='REQUIRED') table = self._makeOne(self.TABLE_NAME, dataset, schema=[full_name, age]) - self.assertEqual(table.partition_expiration, None) + self.assertIsNone(table.partition_expiration) table.partition_expiration = 100 self.assertEqual(table.partitioning_type, "DAY") self.assertEqual(table.partition_expiration, 100) @@ -533,7 +533,7 @@ def test_partition_type_setter_w_known_value(self): age = SchemaField('age', 'INTEGER', mode='REQUIRED') table = self._makeOne(self.TABLE_NAME, dataset, schema=[full_name, age]) - self.assertEqual(table.partitioning_type, None) + self.assertIsNone(table.partitioning_type) table.partitioning_type = 'DAY' self.assertEqual(table.partitioning_type, 'DAY') @@ -549,7 +549,7 @@ def test_partition_type_setter_w_none(self): schema=[full_name, age]) table._properties['timePartitioning'] = {'type': 'DAY'} table.partitioning_type = None - self.assertEqual(table.partitioning_type, None) + self.assertIsNone(table.partitioning_type) self.assertFalse('timePartitioning' in table._properties) def test_partition_experation_bad_type(self): @@ -575,7 +575,7 @@ def test_partition_expiration_w_integer(self): age = SchemaField('age', 'INTEGER', mode='REQUIRED') table = self._makeOne(self.TABLE_NAME, dataset, schema=[full_name, age]) - self.assertEqual(table.partition_expiration, None) + self.assertIsNone(table.partition_expiration) table.partition_expiration = 100 self.assertEqual(table.partitioning_type, "DAY") self.assertEqual(table.partition_expiration, 100) @@ -590,14 +590,14 @@ def test_partition_expiration_w_none(self): age = SchemaField('age', 'INTEGER', mode='REQUIRED') table = self._makeOne(self.TABLE_NAME, dataset, schema=[full_name, age]) - self.assertEqual(table.partition_expiration, None) + self.assertIsNone(table.partition_expiration) table._properties['timePartitioning'] = { 'type': 'DAY', 'expirationMs': 100, } table.partition_expiration = None self.assertEqual(table.partitioning_type, "DAY") - self.assertEqual(table.partition_expiration, None) + self.assertIsNone(table.partition_expiration) def test_partition_expiration_w_none_no_partition_set(self): from google.cloud.bigquery.table import SchemaField @@ -609,10 +609,10 @@ def test_partition_expiration_w_none_no_partition_set(self): age = SchemaField('age', 'INTEGER', mode='REQUIRED') table = self._makeOne(self.TABLE_NAME, dataset, schema=[full_name, age]) - self.assertEqual(table.partition_expiration, None) + self.assertIsNone(table.partition_expiration) table.partition_expiration = None - self.assertEqual(table.partitioning_type, None) - self.assertEqual(table.partition_expiration, None) + self.assertIsNone(table.partitioning_type) + self.assertIsNone(table.partition_expiration) def test_list_partitions(self): from google.cloud.bigquery.table import SchemaField @@ -1138,8 +1138,8 @@ def test_fetch_data_w_alternate_client(self): self.assertEqual(rows[1], ('Bharney Rhubble', 33, False, 1.414)) self.assertEqual(rows[2], ('Wylma Phlyntstone', 29, True, 2.71828)) self.assertEqual(rows[3], ('Bhettye Rhubble', 27, None, None)) - self.assertEqual(total_rows, None) - self.assertEqual(page_token, None) + self.assertIsNone(total_rows) + self.assertIsNone(page_token) self.assertEqual(len(conn1._requested), 0) self.assertEqual(len(conn2._requested), 1) @@ -1239,7 +1239,7 @@ def test_fetch_data_w_record_schema(self): 'local_number': '768-5309', 'rank': 2}) self.assertEqual(rows[2][0], 'Wylma Phlyntstone') - self.assertEqual(rows[2][1], None) + self.assertIsNone(rows[2][1]) self.assertEqual(total_rows, ROWS) self.assertEqual(page_token, TOKEN) diff --git a/unit_tests/bigtable/test_column_family.py b/unit_tests/bigtable/test_column_family.py index c8d8fde1104e..91ce41d09abf 100644 --- a/unit_tests/bigtable/test_column_family.py +++ b/unit_tests/bigtable/test_column_family.py @@ -577,7 +577,7 @@ def _callFUT(self, *args, **kwargs): def test_empty(self): gc_rule_pb = _GcRulePB() - self.assertEqual(self._callFUT(gc_rule_pb), None) + self.assertIsNone(self._callFUT(gc_rule_pb)) def test_max_num_versions(self): from google.cloud.bigtable.column_family import MaxVersionsGCRule diff --git a/unit_tests/bigtable/test_instance.py b/unit_tests/bigtable/test_instance.py index 0b5f8a81558b..b6d001eff34a 100644 --- a/unit_tests/bigtable/test_instance.py +++ b/unit_tests/bigtable/test_instance.py @@ -93,7 +93,7 @@ def test__update_from_pb_success(self): ) instance = self._makeOne(None, None, None, None) - self.assertEqual(instance.display_name, None) + self.assertIsNone(instance.display_name) instance._update_from_pb(instance_pb) self.assertEqual(instance.display_name, display_name) @@ -103,10 +103,10 @@ def test__update_from_pb_no_display_name(self): instance_pb = data_v2_pb2.Instance() instance = self._makeOne(None, None, None, None) - self.assertEqual(instance.display_name, None) + self.assertIsNone(instance.display_name) with self.assertRaises(ValueError): instance._update_from_pb(instance_pb) - self.assertEqual(instance.display_name, None) + self.assertIsNone(instance.display_name) def test_from_pb_success(self): from google.cloud.bigtable.instance import ( diff --git a/unit_tests/bigtable/test_row.py b/unit_tests/bigtable/test_row.py index 864dc740fcac..cd950f33f898 100644 --- a/unit_tests/bigtable/test_row.py +++ b/unit_tests/bigtable/test_row.py @@ -369,7 +369,7 @@ def test_commit_no_mutations(self): # Perform the method and check the result. result = row.commit() - self.assertEqual(result, None) + self.assertIsNone(result) # Make sure no request was sent. self.assertEqual(stub.method_calls, []) @@ -510,7 +510,7 @@ def test_commit_no_mutations(self): # Perform the method and check the result. result = row.commit() - self.assertEqual(result, None) + self.assertIsNone(result) # Make sure no request was sent. self.assertEqual(stub.method_calls, []) diff --git a/unit_tests/bigtable/test_row_filters.py b/unit_tests/bigtable/test_row_filters.py index 00c827fcaa8f..f2533f34390d 100644 --- a/unit_tests/bigtable/test_row_filters.py +++ b/unit_tests/bigtable/test_row_filters.py @@ -351,8 +351,8 @@ def test_constructor_defaults(self): column_family_id = object() row_filter = self._makeOne(column_family_id) self.assertIs(row_filter.column_family_id, column_family_id) - self.assertEqual(row_filter.start_column, None) - self.assertEqual(row_filter.end_column, None) + self.assertIsNone(row_filter.start_column) + self.assertIsNone(row_filter.end_column) self.assertTrue(row_filter.inclusive_start) self.assertTrue(row_filter.inclusive_end) @@ -490,8 +490,8 @@ def _makeOne(self, *args, **kwargs): def test_constructor_defaults(self): row_filter = self._makeOne() - self.assertEqual(row_filter.start_value, None) - self.assertEqual(row_filter.end_value, None) + self.assertIsNone(row_filter.start_value) + self.assertIsNone(row_filter.end_value) self.assertTrue(row_filter.inclusive_start) self.assertTrue(row_filter.inclusive_end) diff --git a/unit_tests/datastore/test_client.py b/unit_tests/datastore/test_client.py index 059367527808..6459493b4bbd 100644 --- a/unit_tests/datastore/test_client.py +++ b/unit_tests/datastore/test_client.py @@ -44,7 +44,7 @@ def test_no_value(self): environ = {} with _Monkey(os, getenv=environ.get): project = self._callFUT() - self.assertEqual(project, None) + self.assertIsNone(project) def test_value_set(self): import os @@ -92,7 +92,7 @@ def fallback_mock(project=None): def test_no_value(self): project, callers = self._determine_default_helper() - self.assertEqual(project, None) + self.assertIsNone(project) self.assertEqual(callers, ['gcd_mock', ('fallback_mock', None)]) def test_explicit(self): @@ -168,7 +168,7 @@ def fallback_mock(project): get_credentials=lambda: creds): client = klass() self.assertEqual(client.project, OTHER) - self.assertEqual(client.namespace, None) + self.assertIsNone(client.namespace) self.assertIsInstance(client.connection, _MockConnection) self.assertIs(client.connection.credentials, creds) self.assertIsNone(client.connection.http) @@ -541,7 +541,7 @@ def _put_multi(*args, **kw): def test_put_multi_no_entities(self): creds = object() client = self._makeOne(credentials=creds) - self.assertEqual(client.put_multi([]), None) + self.assertIsNone(client.put_multi([])) def test_put_multi_w_single_empty_entity(self): # https://github.com/GoogleCloudPlatform/google-cloud-python/issues/649 @@ -592,7 +592,7 @@ def test_put_multi_existing_batch_w_completed_key(self): with _NoCommitBatch(client) as CURR_BATCH: result = client.put_multi([entity]) - self.assertEqual(result, None) + self.assertIsNone(result) mutated_entity = _mutated_pb(self, CURR_BATCH.mutations, 'upsert') self.assertEqual(mutated_entity.key, key.to_protobuf()) @@ -622,7 +622,7 @@ def test_delete_multi_no_keys(self): creds = object() client = self._makeOne(credentials=creds) result = client.delete_multi([]) - self.assertEqual(result, None) + self.assertIsNone(result) self.assertEqual(len(client.connection._commit_cw), 0) def test_delete_multi_no_batch(self): @@ -633,7 +633,7 @@ def test_delete_multi_no_batch(self): client.connection._commit.append([]) result = client.delete_multi([key]) - self.assertEqual(result, None) + self.assertIsNone(result) self.assertEqual(len(client.connection._commit_cw), 1) (project, commit_req, transaction_id) = client.connection._commit_cw[0] @@ -651,7 +651,7 @@ def test_delete_multi_w_existing_batch(self): with _NoCommitBatch(client) as CURR_BATCH: result = client.delete_multi([key]) - self.assertEqual(result, None) + self.assertIsNone(result) mutated_key = _mutated_pb(self, CURR_BATCH.mutations, 'delete') self.assertEqual(mutated_key, key._key) self.assertEqual(len(client.connection._commit_cw), 0) @@ -664,7 +664,7 @@ def test_delete_multi_w_existing_transaction(self): with _NoCommitTransaction(client) as CURR_XACT: result = client.delete_multi([key]) - self.assertEqual(result, None) + self.assertIsNone(result) mutated_key = _mutated_pb(self, CURR_XACT.mutations, 'delete') self.assertEqual(mutated_key, key._key) self.assertEqual(len(client.connection._commit_cw), 0) diff --git a/unit_tests/datastore/test_connection.py b/unit_tests/datastore/test_connection.py index 070b19437eeb..5df1e08c762f 100644 --- a/unit_tests/datastore/test_connection.py +++ b/unit_tests/datastore/test_connection.py @@ -351,7 +351,7 @@ def test_custom_url_from_env(self): def test_ctor_defaults(self): conn = self._makeOne() - self.assertEqual(conn.credentials, None) + self.assertIsNone(conn.credentials) def test_ctor_without_grpc(self): from unit_tests._testing import _Monkey @@ -367,7 +367,7 @@ def mock_api(connection): with _Monkey(MUT, _DatastoreAPIOverHttp=mock_api): conn = self._makeOne(use_grpc=False) - self.assertEqual(conn.credentials, None) + self.assertIsNone(conn.credentials) self.assertIs(conn._datastore_api, return_val) self.assertEqual(connections, [conn]) @@ -385,7 +385,7 @@ def mock_api(connection, secure): with _Monkey(MUT, _DatastoreAPIOverGRPC=mock_api): conn = self._makeOne(use_grpc=True) - self.assertEqual(conn.credentials, None) + self.assertIsNone(conn.credentials) self.assertIs(conn._datastore_api, return_val) self.assertEqual(api_args, [(conn, True)]) @@ -971,7 +971,7 @@ def test_rollback_ok(self): PROJECT + ':rollback', ]) http = conn._http = Http({'status': '200'}, rsp_pb.SerializeToString()) - self.assertEqual(conn.rollback(PROJECT, TRANSACTION), None) + self.assertIsNone(conn.rollback(PROJECT, TRANSACTION)) cw = http._called_with self._verifyProtobufCall(cw, URI, conn) rq_class = datastore_pb2.RollbackRequest diff --git a/unit_tests/datastore/test_entity.py b/unit_tests/datastore/test_entity.py index deff3a90d28f..3091d28b721a 100644 --- a/unit_tests/datastore/test_entity.py +++ b/unit_tests/datastore/test_entity.py @@ -32,8 +32,8 @@ def _makeOne(self, key=None, exclude_from_indexes=()): def test_ctor_defaults(self): klass = self._getTargetClass() entity = klass() - self.assertEqual(entity.key, None) - self.assertEqual(entity.kind, None) + self.assertIsNone(entity.key) + self.assertIsNone(entity.kind) self.assertEqual(sorted(entity.exclude_from_indexes), []) def test_ctor_explicit(self): diff --git a/unit_tests/datastore/test_helpers.py b/unit_tests/datastore/test_helpers.py index 3d3783375b11..66811cfea0a8 100644 --- a/unit_tests/datastore/test_helpers.py +++ b/unit_tests/datastore/test_helpers.py @@ -104,7 +104,7 @@ def test_it(self): # Also check the key. key = entity.key self.assertEqual(key.project, _PROJECT) - self.assertEqual(key.namespace, None) + self.assertIsNone(key.namespace) self.assertEqual(key.kind, _KIND) self.assertEqual(key.id, _ID) @@ -138,7 +138,7 @@ def test_entity_no_key(self): entity_pb = entity_pb2.Entity() entity = self._callFUT(entity_pb) - self.assertEqual(entity.key, None) + self.assertIsNone(entity.key) self.assertEqual(dict(entity), {}) def test_entity_with_meaning(self): @@ -152,7 +152,7 @@ def test_entity_with_meaning(self): value_pb.string_value = val = u'something' entity = self._callFUT(entity_pb) - self.assertEqual(entity.key, None) + self.assertIsNone(entity.key) self.assertEqual(dict(entity), {name: val}) self.assertEqual(entity._meanings, {name: (meaning, val)}) @@ -184,7 +184,7 @@ def test_nested_entity_no_key(self): self.assertEqual(len(entity), 1) inside_entity = entity[OUTSIDE_NAME] - self.assertEqual(inside_entity.key, None) + self.assertIsNone(inside_entity.key) self.assertEqual(len(inside_entity), 1) self.assertEqual(inside_entity[INSIDE_NAME], INSIDE_VALUE) @@ -396,7 +396,7 @@ def test_wo_namespace_in_pb(self): pb = self._makePB(path=[{'kind': 'KIND'}], project=_PROJECT) key = self._callFUT(pb) self.assertEqual(key.project, _PROJECT) - self.assertEqual(key.namespace, None) + self.assertIsNone(key.namespace) def test_w_namespace_in_pb(self): _PROJECT = 'PROJECT' @@ -803,7 +803,7 @@ def test_no_meaning(self): value_pb = entity_pb2.Value() result = self._callFUT(value_pb) - self.assertEqual(result, None) + self.assertIsNone(result) def test_single(self): from google.cloud.datastore._generated import entity_pb2 diff --git a/unit_tests/datastore/test_key.py b/unit_tests/datastore/test_key.py index 46d7418202a2..d4d8bfc5e063 100644 --- a/unit_tests/datastore/test_key.py +++ b/unit_tests/datastore/test_key.py @@ -294,14 +294,14 @@ def test_completed_key_on_partial_w_id(self): new_key = key.completed_key(_ID) self.assertIsNot(key, new_key) self.assertEqual(new_key.id, _ID) - self.assertEqual(new_key.name, None) + self.assertIsNone(new_key.name) def test_completed_key_on_partial_w_name(self): key = self._makeOne('KIND', project=self._DEFAULT_PROJECT) _NAME = 'NAME' new_key = key.completed_key(_NAME) self.assertIsNot(key, new_key) - self.assertEqual(new_key.id, None) + self.assertIsNone(new_key.id) self.assertEqual(new_key.name, _NAME) def test_completed_key_on_partial_w_invalid(self): @@ -386,12 +386,12 @@ def test_is_partial_w_name(self): def test_id_or_name_no_name_or_id(self): key = self._makeOne('KIND', project=self._DEFAULT_PROJECT) - self.assertEqual(key.id_or_name, None) + self.assertIsNone(key.id_or_name) def test_id_or_name_no_name_or_id_child(self): key = self._makeOne('KIND1', 1234, 'KIND2', project=self._DEFAULT_PROJECT) - self.assertEqual(key.id_or_name, None) + self.assertIsNone(key.id_or_name) def test_id_or_name_w_id_only(self): _ID = 1234 @@ -405,11 +405,11 @@ def test_id_or_name_w_name_only(self): def test_parent_default(self): key = self._makeOne('KIND', project=self._DEFAULT_PROJECT) - self.assertEqual(key.parent, None) + self.assertIsNone(key.parent) def test_parent_explicit_top_level(self): key = self._makeOne('KIND', 1234, project=self._DEFAULT_PROJECT) - self.assertEqual(key.parent, None) + self.assertIsNone(key.parent) def test_parent_explicit_nested(self): _PARENT_KIND = 'KIND1' diff --git a/unit_tests/datastore/test_query.py b/unit_tests/datastore/test_query.py index cfd41419483a..0ae28e5a28c2 100644 --- a/unit_tests/datastore/test_query.py +++ b/unit_tests/datastore/test_query.py @@ -36,9 +36,9 @@ def test_ctor_defaults(self): query = self._makeOne(client) self.assertIs(query._client, client) self.assertEqual(query.project, client.project) - self.assertEqual(query.kind, None) + self.assertIsNone(query.kind) self.assertEqual(query.namespace, client.namespace) - self.assertEqual(query.ancestor, None) + self.assertIsNone(query.ancestor) self.assertEqual(query.filters, []) self.assertEqual(query.projection, []) self.assertEqual(query.order, []) @@ -315,7 +315,7 @@ def test_fetch_defaults_w_client_attr(self): iterator = query.fetch() self.assertIs(iterator._query, query) self.assertIs(iterator._client, client) - self.assertEqual(iterator._limit, None) + self.assertIsNone(iterator._limit) self.assertEqual(iterator._offset, 0) def test_fetch_w_explicit_client(self): @@ -381,9 +381,9 @@ def test_ctor_defaults(self): query = object() iterator = self._makeOne(query, connection) self.assertIs(iterator._query, query) - self.assertEqual(iterator._limit, None) - self.assertEqual(iterator._offset, None) - self.assertEqual(iterator._skipped_results, None) + self.assertIsNone(iterator._limit) + self.assertIsNone(iterator._offset) + self.assertIsNone(iterator._skipped_results) def test_ctor_explicit(self): client = self._makeClient() @@ -401,9 +401,9 @@ def test_next_page_no_cursors_no_more(self): self._addQueryResults(connection, cursor=b'') iterator = self._makeOne(query, client) entities, more_results, cursor = iterator.next_page() - self.assertEqual(iterator._skipped_results, None) + self.assertIsNone(iterator._skipped_results) - self.assertEqual(cursor, None) + self.assertIsNone(cursor) self.assertFalse(more_results) self.assertFalse(iterator._more_results) self.assertEqual(len(entities), 1) @@ -431,7 +431,7 @@ def test_next_page_no_cursors_no_more_w_offset_and_limit(self): iterator = self._makeOne(query, client, 13, 29) entities, more_results, cursor = iterator.next_page() - self.assertEqual(cursor, None) + self.assertIsNone(cursor) self.assertFalse(more_results) self.assertFalse(iterator._more_results) self.assertEqual(iterator._skipped_results, skipped_results) @@ -466,8 +466,8 @@ def test_next_page_w_cursors_w_more(self): self.assertEqual(cursor, urlsafe_b64encode(self._END)) self.assertTrue(more_results) self.assertTrue(iterator._more_results) - self.assertEqual(iterator._skipped_results, None) - self.assertEqual(iterator._end_cursor, None) + self.assertIsNone(iterator._skipped_results) + self.assertIsNone(iterator._end_cursor) self.assertEqual(urlsafe_b64decode(iterator._start_cursor), self._END) self.assertEqual(len(entities), 1) self.assertEqual(entities[0].key.path, diff --git a/unit_tests/datastore/test_transaction.py b/unit_tests/datastore/test_transaction.py index 73e3ed3faee9..5f2a841490f0 100644 --- a/unit_tests/datastore/test_transaction.py +++ b/unit_tests/datastore/test_transaction.py @@ -33,7 +33,7 @@ def test_ctor_defaults(self): xact = self._makeOne(client) self.assertEqual(xact.project, _PROJECT) self.assertEqual(xact.connection, connection) - self.assertEqual(xact.id, None) + self.assertIsNone(xact.id) self.assertEqual(xact._status, self._getTargetClass()._INITIAL) self.assertIsInstance(xact._commit_request, datastore_pb2.CommitRequest) @@ -84,7 +84,7 @@ def test_begin_tombstoned(self): self.assertEqual(connection._begun, _PROJECT) xact.rollback() - self.assertEqual(xact.id, None) + self.assertIsNone(xact.id) self.assertRaises(ValueError, xact.begin) @@ -108,7 +108,7 @@ def test_rollback(self): xact = self._makeOne(client) xact.begin() xact.rollback() - self.assertEqual(xact.id, None) + self.assertIsNone(xact.id) self.assertEqual(connection._rolled_back, (_PROJECT, 234)) def test_commit_no_partial_keys(self): @@ -121,7 +121,7 @@ def test_commit_no_partial_keys(self): xact.commit() self.assertEqual(connection._committed, (_PROJECT, commit_request, 234)) - self.assertEqual(xact.id, None) + self.assertIsNone(xact.id) def test_commit_w_partial_keys(self): _PROJECT = 'PROJECT' @@ -138,7 +138,7 @@ def test_commit_w_partial_keys(self): xact.commit() self.assertEqual(connection._committed, (_PROJECT, commit_request, 234)) - self.assertEqual(xact.id, None) + self.assertIsNone(xact.id) self.assertEqual(entity.key.path, [{'kind': _KIND, 'id': _ID}]) def test_context_manager_no_raise(self): @@ -152,7 +152,7 @@ def test_context_manager_no_raise(self): self.assertEqual(connection._begun, _PROJECT) self.assertEqual(connection._committed, (_PROJECT, commit_request, 234)) - self.assertEqual(xact.id, None) + self.assertIsNone(xact.id) def test_context_manager_w_raise(self): @@ -170,10 +170,10 @@ class Foo(Exception): self.assertEqual(connection._begun, _PROJECT) raise Foo() except Foo: - self.assertEqual(xact.id, None) + self.assertIsNone(xact.id) self.assertEqual(connection._rolled_back, (_PROJECT, 234)) - self.assertEqual(connection._committed, None) - self.assertEqual(xact.id, None) + self.assertIsNone(connection._committed) + self.assertIsNone(xact.id) def _make_key(kind, id_, project): diff --git a/unit_tests/dns/test_changes.py b/unit_tests/dns/test_changes.py index cd53f26238a6..aec2f013c5b3 100644 --- a/unit_tests/dns/test_changes.py +++ b/unit_tests/dns/test_changes.py @@ -85,9 +85,9 @@ def test_ctor(self): changes = self._makeOne(zone) self.assertIs(changes.zone, zone) - self.assertEqual(changes.name, None) - self.assertEqual(changes.status, None) - self.assertEqual(changes.started, None) + self.assertIsNone(changes.name) + self.assertIsNone(changes.status) + self.assertIsNone(changes.started) self.assertEqual(list(changes.additions), []) self.assertEqual(list(changes.deletions), []) diff --git a/unit_tests/dns/test_client.py b/unit_tests/dns/test_client.py index 112dbca2ff6d..f7c754fb5382 100644 --- a/unit_tests/dns/test_client.py +++ b/unit_tests/dns/test_client.py @@ -181,7 +181,7 @@ def test_list_zones_explicit(self): self.assertEqual(found.zone_id, expected['id']) self.assertEqual(found.name, expected['name']) self.assertEqual(found.dns_name, expected['dnsName']) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(len(conn._requested), 1) req = conn._requested[0] @@ -222,8 +222,8 @@ def test_zone_wo_dns_name(self): zone = client.zone(self.ZONE_NAME) self.assertIsInstance(zone, ManagedZone) self.assertEqual(zone.name, self.ZONE_NAME) - self.assertEqual(zone.dns_name, None) - self.assertEqual(zone.description, None) + self.assertIsNone(zone.dns_name) + self.assertIsNone(zone.description) self.assertIs(zone._client, client) diff --git a/unit_tests/dns/test_zone.py b/unit_tests/dns/test_zone.py index 0251122aaf84..12b07f872854 100644 --- a/unit_tests/dns/test_zone.py +++ b/unit_tests/dns/test_zone.py @@ -67,12 +67,12 @@ def _verifyReadonlyResourceProperties(self, zone, resource): if 'creationTime' in resource: self.assertEqual(zone.created, self.WHEN) else: - self.assertEqual(zone.created, None) + self.assertIsNone(zone.created) if 'nameServers' in resource: self.assertEqual(zone.name_servers, resource['nameServers']) else: - self.assertEqual(zone.name_servers, None) + self.assertIsNone(zone.name_servers) def _verifyResourceProperties(self, zone, resource): @@ -87,7 +87,7 @@ def _verifyResourceProperties(self, zone, resource): def test_ctor_defaults(self): zone = self._makeOne(self.ZONE_NAME) self.assertEqual(zone.name, self.ZONE_NAME) - self.assertEqual(zone.dns_name, None) + self.assertIsNone(zone.dns_name) self.assertIsNone(zone._client) with self.assertRaises(AttributeError): @@ -96,9 +96,9 @@ def test_ctor_defaults(self): with self.assertRaises(AttributeError): _ = zone.path - self.assertEqual(zone.zone_id, None) - self.assertEqual(zone.created, None) - self.assertEqual(zone.description, None) + self.assertIsNone(zone.zone_id) + self.assertIsNone(zone.created) + self.assertIsNone(zone.description) def test_ctor_wo_description(self): client = _Client(self.PROJECT) @@ -110,8 +110,8 @@ def test_ctor_wo_description(self): self.assertEqual( zone.path, '/projects/%s/managedZones/%s' % (self.PROJECT, self.ZONE_NAME)) - self.assertEqual(zone.zone_id, None) - self.assertEqual(zone.created, None) + self.assertIsNone(zone.zone_id) + self.assertIsNone(zone.created) self.assertEqual(zone.description, self.DNS_NAME) def test_ctor_explicit(self): @@ -126,8 +126,8 @@ def test_ctor_explicit(self): self.assertEqual( zone.path, '/projects/%s/managedZones/%s' % (self.PROJECT, self.ZONE_NAME)) - self.assertEqual(zone.zone_id, None) - self.assertEqual(zone.created, None) + self.assertIsNone(zone.zone_id) + self.assertIsNone(zone.created) self.assertEqual(zone.description, DESCRIPTION) def test_from_api_repr_missing_identity(self): @@ -499,7 +499,7 @@ def test_list_resource_record_sets_explicit(self): self.assertEqual(found.record_type, expected['type']) self.assertEqual(found.ttl, int(expected['ttl'])) self.assertEqual(found.rrdatas, expected['rrdatas']) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(len(conn1._requested), 0) self.assertEqual(len(conn2._requested), 1) @@ -656,7 +656,7 @@ def test_list_changes_explicit(self): self.assertEqual(found_rr.ttl, int(expected_rr['ttl'])) self.assertEqual(found_rr.rrdatas, expected_rr['rrdatas']) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(len(conn1._requested), 0) self.assertEqual(len(conn2._requested), 1) diff --git a/unit_tests/logging/test__gax.py b/unit_tests/logging/test__gax.py index daf7f1672179..c27068c2d770 100644 --- a/unit_tests/logging/test__gax.py +++ b/unit_tests/logging/test__gax.py @@ -214,11 +214,11 @@ def test_write_entries_single(self): self.assertEqual(entry.labels, {}) self.assertEqual(entry.text_payload, TEXT) - self.assertEqual(log_name, None) - self.assertEqual(resource, None) - self.assertEqual(labels, None) + self.assertIsNone(log_name) + self.assertIsNone(resource) + self.assertIsNone(labels) self.assertEqual(partial_success, False) - self.assertEqual(options, None) + self.assertIsNone(options) def test_write_entries_w_extra_properties(self): # pylint: disable=too-many-statements @@ -309,11 +309,11 @@ def test_write_entries_w_extra_properties(self): self.assertFalse(operation.first) self.assertTrue(operation.last) - self.assertEqual(log_name, None) - self.assertEqual(resource, None) - self.assertEqual(labels, None) + self.assertIsNone(log_name) + self.assertIsNone(resource) + self.assertIsNone(labels) self.assertEqual(partial_success, False) - self.assertEqual(options, None) + self.assertIsNone(options) # pylint: enable=too-many-statements def test_write_entries_multiple(self): @@ -395,7 +395,7 @@ def test_write_entries_multiple(self): self.assertEqual(resource, RESOURCE) self.assertEqual(labels, LABELS) self.assertEqual(partial_success, False) - self.assertEqual(options, None) + self.assertIsNone(options) # pylint: enable=too-many-statements def test_logger_delete(self): @@ -407,7 +407,7 @@ def test_logger_delete(self): log_name, options = gax_api._delete_log_called_with self.assertEqual(log_name, LOG_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_logger_delete_not_found(self): from google.cloud.exceptions import NotFound @@ -420,7 +420,7 @@ def test_logger_delete_not_found(self): log_name, options = gax_api._delete_log_called_with self.assertEqual(log_name, LOG_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_logger_delete_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -434,7 +434,7 @@ def test_logger_delete_error(self): log_name, options = gax_api._delete_log_called_with self.assertEqual(log_name, LOG_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) @unittest.skipUnless(_HAVE_GAX, 'No gax-python') @@ -496,7 +496,7 @@ def test_list_sinks_w_paging(self): self.PROJECT, page_size=PAGE_SIZE, page_token=TOKEN) self.assertEqual(sinks, SINKS) - self.assertEqual(token, None) + self.assertIsNone(token) project, page_size, options = gax_api._list_sinks_called_with self.assertEqual(project, self.PROJECT_PATH) @@ -539,7 +539,7 @@ def test_sink_create_ok(self): self.assertEqual(sink.name, self.SINK_NAME) self.assertEqual(sink.filter, self.FILTER) self.assertEqual(sink.destination, self.DESTINATION_URI) - self.assertEqual(options, None) + self.assertIsNone(options) def test_sink_get_error(self): from google.cloud.exceptions import NotFound @@ -575,7 +575,7 @@ def test_sink_get_hit(self): sink_name, options = gax_api._get_sink_called_with self.assertEqual(sink_name, self.SINK_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_sink_update_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -615,7 +615,7 @@ def test_sink_update_hit(self): self.assertEqual(sink.name, self.SINK_PATH) self.assertEqual(sink.filter, self.FILTER) self.assertEqual(sink.destination, self.DESTINATION_URI) - self.assertEqual(options, None) + self.assertIsNone(options) def test_sink_delete_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -642,7 +642,7 @@ def test_sink_delete_hit(self): sink_name, options = gax_api._delete_sink_called_with self.assertEqual(sink_name, self.SINK_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) @unittest.skipUnless(_HAVE_GAX, 'No gax-python') @@ -704,7 +704,7 @@ def test_list_metrics_w_paging(self): self.PROJECT, page_size=PAGE_SIZE, page_token=TOKEN) self.assertEqual(metrics, METRICS) - self.assertEqual(token, None) + self.assertIsNone(token) project, page_size, options = gax_api._list_log_metrics_called_with self.assertEqual(project, self.PROJECT_PATH) @@ -747,7 +747,7 @@ def test_metric_create_ok(self): self.assertEqual(metric.name, self.METRIC_NAME) self.assertEqual(metric.filter, self.FILTER) self.assertEqual(metric.description, self.DESCRIPTION) - self.assertEqual(options, None) + self.assertIsNone(options) def test_metric_get_error(self): from google.cloud.exceptions import NotFound @@ -783,7 +783,7 @@ def test_metric_get_hit(self): metric_name, options = gax_api._get_log_metric_called_with self.assertEqual(metric_name, self.METRIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_metric_update_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -823,7 +823,7 @@ def test_metric_update_hit(self): self.assertEqual(metric.name, self.METRIC_PATH) self.assertEqual(metric.filter, self.FILTER) self.assertEqual(metric.description, self.DESCRIPTION) - self.assertEqual(options, None) + self.assertIsNone(options) def test_metric_delete_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -850,7 +850,7 @@ def test_metric_delete_hit(self): metric_name, options = gax_api._delete_log_metric_called_with self.assertEqual(metric_name, self.METRIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) @unittest.skipUnless(_HAVE_GAX, 'No gax-python') @@ -863,9 +863,9 @@ def _callFUT(self, value_pb): def test_w_null_values(self): from google.protobuf.struct_pb2 import Value value_pb = Value() - self.assertEqual(self._callFUT(value_pb), None) + self.assertIsNone(self._callFUT(value_pb)) value_pb = Value(null_value=None) - self.assertEqual(self._callFUT(value_pb), None) + self.assertIsNone(self._callFUT(value_pb)) def test_w_string_value(self): from google.protobuf.struct_pb2 import Value diff --git a/unit_tests/logging/test_client.py b/unit_tests/logging/test_client.py index 63749960fb67..a0e4b81e0db4 100644 --- a/unit_tests/logging/test_client.py +++ b/unit_tests/logging/test_client.py @@ -296,7 +296,7 @@ def test_list_entries_explicit(self): self.assertIs(entries[0].logger, entries[1].logger) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual( api._list_entries_called_with, ([PROJECT1, PROJECT2], FILTER, DESCENDING, PAGE_SIZE, TOKEN)) @@ -308,8 +308,8 @@ def test_sink_defaults(self): sink = client.sink(self.SINK_NAME) self.assertIsInstance(sink, Sink) self.assertEqual(sink.name, self.SINK_NAME) - self.assertEqual(sink.filter_, None) - self.assertEqual(sink.destination, None) + self.assertIsNone(sink.filter_) + self.assertIsNone(sink.destination) self.assertIs(sink.client, client) self.assertEqual(sink.project, self.PROJECT) @@ -377,7 +377,7 @@ def test_list_sinks_with_paging(self): self.assertEqual(sink.name, SINK_NAME) self.assertEqual(sink.filter_, FILTER) self.assertEqual(sink.destination, self.DESTINATION_URI) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(api._list_sinks_called_with, (PROJECT, PAGE_SIZE, TOKEN)) @@ -389,7 +389,7 @@ def test_metric_defaults(self): metric = client_obj.metric(self.METRIC_NAME) self.assertIsInstance(metric, Metric) self.assertEqual(metric.name, self.METRIC_NAME) - self.assertEqual(metric.filter_, None) + self.assertIsNone(metric.filter_) self.assertEqual(metric.description, '') self.assertIs(metric.client, client_obj) self.assertEqual(metric.project, self.PROJECT) @@ -456,7 +456,7 @@ def test_list_metrics_with_paging(self): self.assertEqual(metric.name, self.METRIC_NAME) self.assertEqual(metric.filter_, self.FILTER) self.assertEqual(metric.description, self.DESCRIPTION) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(api._list_metrics_called_with, (PROJECT, PAGE_SIZE, TOKEN)) diff --git a/unit_tests/logging/test_connection.py b/unit_tests/logging/test_connection.py index 436f01b1d21d..f70df802de5d 100644 --- a/unit_tests/logging/test_connection.py +++ b/unit_tests/logging/test_connection.py @@ -145,7 +145,7 @@ def test_list_entries_w_paging(self): order_by=DESCENDING, page_size=PAGE_SIZE, page_token=TOKEN) self.assertEqual(entries, RETURNED['entries']) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(conn._called_with['method'], 'POST') path = '/%s' % self.LIST_ENTRIES_PATH @@ -279,7 +279,7 @@ def test_list_sinks_w_paging(self): self.PROJECT, page_size=PAGE_SIZE, page_token=TOKEN) self.assertEqual(sinks, RETURNED['sinks']) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(conn._called_with['method'], 'GET') path = '/%s' % (self.LIST_SINKS_PATH,) @@ -466,7 +466,7 @@ def test_list_metrics_w_paging(self): self.PROJECT, page_size=PAGE_SIZE, page_token=TOKEN) self.assertEqual(metrics, RETURNED['metrics']) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(conn._called_with['method'], 'GET') path = '/%s' % (self.LIST_METRICS_PATH,) diff --git a/unit_tests/logging/test_logger.py b/unit_tests/logging/test_logger.py index 0cb541b3575e..ff9a894890de 100644 --- a/unit_tests/logging/test_logger.py +++ b/unit_tests/logging/test_logger.py @@ -38,7 +38,7 @@ def test_ctor_defaults(self): % (self.PROJECT, self.LOGGER_NAME)) self.assertEqual(logger.path, '/projects/%s/logs/%s' % (self.PROJECT, self.LOGGER_NAME)) - self.assertEqual(logger.labels, None) + self.assertIsNone(logger.labels) def test_ctor_explicit(self): LABELS = {'foo': 'bar', 'baz': 'qux'} @@ -385,7 +385,7 @@ def test_list_entries_explicit(self): projects=[PROJECT1, PROJECT2], filter_=FILTER, order_by=DESCENDING, page_size=PAGE_SIZE, page_token=TOKEN) self.assertEqual(len(entries), 0) - self.assertEqual(token, None) + self.assertIsNone(token) self.assertEqual(client._listed, LISTED) @@ -663,7 +663,7 @@ def test_context_mgr_failure(self): pass self.assertEqual(list(batch.entries), UNSENT) - self.assertEqual(api._write_entries_called_with, None) + self.assertIsNone(api._write_entries_called_with) class _Logger(object): diff --git a/unit_tests/logging/test_metric.py b/unit_tests/logging/test_metric.py index 865afc1e68f4..7eb3b615034f 100644 --- a/unit_tests/logging/test_metric.py +++ b/unit_tests/logging/test_metric.py @@ -34,7 +34,7 @@ def test_ctor_defaults(self): client = _Client(self.PROJECT) metric = self._makeOne(self.METRIC_NAME, client=client) self.assertEqual(metric.name, self.METRIC_NAME) - self.assertEqual(metric.filter_, None) + self.assertIsNone(metric.filter_) self.assertEqual(metric.description, '') self.assertIs(metric.client, client) self.assertEqual(metric.project, self.PROJECT) diff --git a/unit_tests/logging/test_sink.py b/unit_tests/logging/test_sink.py index 34cb6ace1e6d..89459854fee5 100644 --- a/unit_tests/logging/test_sink.py +++ b/unit_tests/logging/test_sink.py @@ -34,8 +34,8 @@ def test_ctor_defaults(self): client = _Client(self.PROJECT) sink = self._makeOne(self.SINK_NAME, client=client) self.assertEqual(sink.name, self.SINK_NAME) - self.assertEqual(sink.filter_, None) - self.assertEqual(sink.destination, None) + self.assertIsNone(sink.filter_) + self.assertIsNone(sink.destination) self.assertIs(sink.client, client) self.assertEqual(sink.project, self.PROJECT) self.assertEqual(sink.full_name, FULL) diff --git a/unit_tests/pubsub/test__gax.py b/unit_tests/pubsub/test__gax.py index 4ce51c73cfde..ad7752c17aa6 100644 --- a/unit_tests/pubsub/test__gax.py +++ b/unit_tests/pubsub/test__gax.py @@ -108,7 +108,7 @@ def test_topic_create(self): self.assertEqual(resource, {'name': self.TOPIC_PATH}) topic_path, options = gax_api._create_topic_called_with self.assertEqual(topic_path, self.TOPIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_topic_create_already_exists(self): from google.cloud.exceptions import Conflict @@ -120,7 +120,7 @@ def test_topic_create_already_exists(self): topic_path, options = gax_api._create_topic_called_with self.assertEqual(topic_path, self.TOPIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_topic_create_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -133,7 +133,7 @@ def test_topic_create_error(self): topic_path, options = gax_api._create_topic_called_with self.assertEqual(topic_path, self.TOPIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_topic_get_hit(self): topic_pb = _TopicPB(self.TOPIC_PATH) @@ -145,7 +145,7 @@ def test_topic_get_hit(self): self.assertEqual(resource, {'name': self.TOPIC_PATH}) topic_path, options = gax_api._get_topic_called_with self.assertEqual(topic_path, self.TOPIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_topic_get_miss(self): from google.cloud.exceptions import NotFound @@ -157,7 +157,7 @@ def test_topic_get_miss(self): topic_path, options = gax_api._get_topic_called_with self.assertEqual(topic_path, self.TOPIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_topic_get_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -170,7 +170,7 @@ def test_topic_get_error(self): topic_path, options = gax_api._get_topic_called_with self.assertEqual(topic_path, self.TOPIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_topic_delete_hit(self): gax_api = _GAXPublisherAPI(_delete_topic_ok=True) @@ -180,7 +180,7 @@ def test_topic_delete_hit(self): topic_path, options = gax_api._delete_topic_called_with self.assertEqual(topic_path, self.TOPIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_topic_delete_miss(self): from google.cloud.exceptions import NotFound @@ -192,7 +192,7 @@ def test_topic_delete_miss(self): topic_path, options = gax_api._delete_topic_called_with self.assertEqual(topic_path, self.TOPIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_topic_delete_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -205,7 +205,7 @@ def test_topic_delete_error(self): topic_path, options = gax_api._delete_topic_called_with self.assertEqual(topic_path, self.TOPIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_topic_publish_hit(self): import base64 @@ -282,7 +282,7 @@ def test_topic_list_subscriptions_no_paging(self): self.assertIsInstance(subscription, dict) self.assertEqual(subscription['name'], self.SUB_PATH) self.assertEqual(subscription['topic'], self.TOPIC_PATH) - self.assertEqual(next_token, None) + self.assertIsNone(next_token) topic_path, page_size, options = ( gax_api._list_topic_subscriptions_called_with) @@ -380,7 +380,7 @@ def test_list_subscriptions_no_paging(self): self.assertEqual(subscription['pushConfig'], {'pushEndpoint': self.PUSH_ENDPOINT}) self.assertEqual(subscription['ackDeadlineSeconds'], 0) - self.assertEqual(next_token, None) + self.assertIsNone(next_token) name, page_size, options = gax_api._list_subscriptions_called_with self.assertEqual(name, self.PROJECT_PATH) @@ -432,9 +432,9 @@ def test_subscription_create(self): gax_api._create_subscription_called_with) self.assertEqual(name, self.SUB_PATH) self.assertEqual(topic, self.TOPIC_PATH) - self.assertEqual(push_config, None) + self.assertIsNone(push_config) self.assertEqual(ack_deadline, 0) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_create_already_exists(self): from google.cloud.exceptions import Conflict @@ -452,7 +452,7 @@ def test_subscription_create_already_exists(self): self.assertEqual(topic, self.TOPIC_PATH) self.assertEqual(push_config.push_endpoint, self.PUSH_ENDPOINT) self.assertEqual(ack_deadline, DEADLINE) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_create_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -467,9 +467,9 @@ def test_subscription_create_error(self): gax_api._create_subscription_called_with) self.assertEqual(name, self.SUB_PATH) self.assertEqual(topic, self.TOPIC_PATH) - self.assertEqual(push_config, None) + self.assertIsNone(push_config) self.assertEqual(ack_deadline, 0) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_get_hit(self): sub_pb = _SubscriptionPB( @@ -490,7 +490,7 @@ def test_subscription_get_hit(self): self.assertEqual(resource, expected) sub_path, options = gax_api._get_subscription_called_with self.assertEqual(sub_path, self.SUB_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_get_miss(self): from google.cloud.exceptions import NotFound @@ -502,7 +502,7 @@ def test_subscription_get_miss(self): sub_path, options = gax_api._get_subscription_called_with self.assertEqual(sub_path, self.SUB_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_get_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -515,7 +515,7 @@ def test_subscription_get_error(self): sub_path, options = gax_api._get_subscription_called_with self.assertEqual(sub_path, self.SUB_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_delete_hit(self): gax_api = _GAXSubscriberAPI(_delete_subscription_ok=True) @@ -525,7 +525,7 @@ def test_subscription_delete_hit(self): sub_path, options = gax_api._delete_subscription_called_with self.assertEqual(sub_path, self.TOPIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_delete_miss(self): from google.cloud.exceptions import NotFound @@ -537,7 +537,7 @@ def test_subscription_delete_miss(self): sub_path, options = gax_api._delete_subscription_called_with self.assertEqual(sub_path, self.TOPIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_delete_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -550,7 +550,7 @@ def test_subscription_delete_error(self): sub_path, options = gax_api._delete_subscription_called_with self.assertEqual(sub_path, self.TOPIC_PATH) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_modify_push_config_hit(self): gax_api = _GAXSubscriberAPI(_modify_push_config_ok=True) @@ -561,7 +561,7 @@ def test_subscription_modify_push_config_hit(self): sub_path, config, options = gax_api._modify_push_config_called_with self.assertEqual(sub_path, self.SUB_PATH) self.assertEqual(config.push_endpoint, self.PUSH_ENDPOINT) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_modify_push_config_miss(self): from google.cloud.exceptions import NotFound @@ -575,7 +575,7 @@ def test_subscription_modify_push_config_miss(self): sub_path, config, options = gax_api._modify_push_config_called_with self.assertEqual(sub_path, self.SUB_PATH) self.assertEqual(config.push_endpoint, self.PUSH_ENDPOINT) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_modify_push_config_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -590,7 +590,7 @@ def test_subscription_modify_push_config_error(self): sub_path, config, options = gax_api._modify_push_config_called_with self.assertEqual(sub_path, self.SUB_PATH) self.assertEqual(config.push_endpoint, self.PUSH_ENDPOINT) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_pull_explicit(self): import base64 @@ -627,7 +627,7 @@ def test_subscription_pull_explicit(self): self.assertEqual(sub_path, self.SUB_PATH) self.assertEqual(max_messages, MAX_MESSAGES) self.assertTrue(return_immediately) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_pull_defaults_miss(self): from google.cloud.exceptions import NotFound @@ -642,7 +642,7 @@ def test_subscription_pull_defaults_miss(self): self.assertEqual(sub_path, self.SUB_PATH) self.assertEqual(max_messages, 1) self.assertFalse(return_immediately) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_pull_defaults_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -658,7 +658,7 @@ def test_subscription_pull_defaults_error(self): self.assertEqual(sub_path, self.SUB_PATH) self.assertEqual(max_messages, 1) self.assertFalse(return_immediately) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_acknowledge_hit(self): ACK_ID1 = 'DEADBEEF' @@ -671,7 +671,7 @@ def test_subscription_acknowledge_hit(self): sub_path, ack_ids, options = gax_api._acknowledge_called_with self.assertEqual(sub_path, self.SUB_PATH) self.assertEqual(ack_ids, [ACK_ID1, ACK_ID2]) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_acknowledge_miss(self): from google.cloud.exceptions import NotFound @@ -686,7 +686,7 @@ def test_subscription_acknowledge_miss(self): sub_path, ack_ids, options = gax_api._acknowledge_called_with self.assertEqual(sub_path, self.SUB_PATH) self.assertEqual(ack_ids, [ACK_ID1, ACK_ID2]) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_acknowledge_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -702,7 +702,7 @@ def test_subscription_acknowledge_error(self): sub_path, ack_ids, options = gax_api._acknowledge_called_with self.assertEqual(sub_path, self.SUB_PATH) self.assertEqual(ack_ids, [ACK_ID1, ACK_ID2]) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_modify_ack_deadline_hit(self): ACK_ID1 = 'DEADBEEF' @@ -719,7 +719,7 @@ def test_subscription_modify_ack_deadline_hit(self): self.assertEqual(sub_path, self.SUB_PATH) self.assertEqual(ack_ids, [ACK_ID1, ACK_ID2]) self.assertEqual(deadline, NEW_DEADLINE) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_modify_ack_deadline_miss(self): from google.cloud.exceptions import NotFound @@ -738,7 +738,7 @@ def test_subscription_modify_ack_deadline_miss(self): self.assertEqual(sub_path, self.SUB_PATH) self.assertEqual(ack_ids, [ACK_ID1, ACK_ID2]) self.assertEqual(deadline, NEW_DEADLINE) - self.assertEqual(options, None) + self.assertIsNone(options) def test_subscription_modify_ack_deadline_error(self): from google.cloud.exceptions import GrpcRendezvous @@ -758,7 +758,7 @@ def test_subscription_modify_ack_deadline_error(self): self.assertEqual(sub_path, self.SUB_PATH) self.assertEqual(ack_ids, [ACK_ID1, ACK_ID2]) self.assertEqual(deadline, NEW_DEADLINE) - self.assertEqual(options, None) + self.assertIsNone(options) @unittest.skipUnless(_HAVE_GAX, 'No gax-python') diff --git a/unit_tests/pubsub/test_client.py b/unit_tests/pubsub/test_client.py index 306b496ed52e..05e301a676fa 100644 --- a/unit_tests/pubsub/test_client.py +++ b/unit_tests/pubsub/test_client.py @@ -154,7 +154,7 @@ def test_list_topics_no_paging(self): self.assertEqual(len(topics), 1) self.assertIsInstance(topics[0], Topic) self.assertEqual(topics[0].name, self.TOPIC_NAME) - self.assertEqual(next_page_token, None) + self.assertIsNone(next_page_token) self.assertEqual(api._listed_topics, (self.PROJECT, None, None)) @@ -188,7 +188,7 @@ def test_list_topics_missing_key(self): topics, next_page_token = client.list_topics() self.assertEqual(len(topics), 0) - self.assertEqual(next_page_token, None) + self.assertIsNone(next_page_token) self.assertEqual(api._listed_topics, (self.PROJECT, None, None)) @@ -207,7 +207,7 @@ def test_list_subscriptions_no_paging(self): self.assertIsInstance(subscriptions[0], Subscription) self.assertEqual(subscriptions[0].name, self.SUB_NAME) self.assertEqual(subscriptions[0].topic.name, self.TOPIC_NAME) - self.assertEqual(next_page_token, None) + self.assertIsNone(next_page_token) self.assertEqual(api._listed_subscriptions, (self.PROJECT, None, None)) @@ -256,7 +256,7 @@ def test_list_subscriptions_w_missing_key(self): subscriptions, next_page_token = client.list_subscriptions() self.assertEqual(len(subscriptions), 0) - self.assertEqual(next_page_token, None) + self.assertIsNone(next_page_token) self.assertEqual(api._listed_subscriptions, (self.PROJECT, None, None)) diff --git a/unit_tests/pubsub/test_connection.py b/unit_tests/pubsub/test_connection.py index 55b00ae9eeec..7e363ff3a3ea 100644 --- a/unit_tests/pubsub/test_connection.py +++ b/unit_tests/pubsub/test_connection.py @@ -115,7 +115,7 @@ def test_list_topics_no_paging(self): topic = topics[0] self.assertIsInstance(topic, dict) self.assertEqual(topic['name'], self.TOPIC_PATH) - self.assertEqual(next_token, None) + self.assertIsNone(next_token) self.assertEqual(connection._called_with['method'], 'GET') path = '/%s' % (self.LIST_TOPICS_PATH,) @@ -156,7 +156,7 @@ def test_list_topics_missing_key(self): topics, next_token = api.list_topics(self.PROJECT) self.assertEqual(len(topics), 0) - self.assertEqual(next_token, None) + self.assertIsNone(next_token) self.assertEqual(connection._called_with['method'], 'GET') path = '/%s' % (self.LIST_TOPICS_PATH,) @@ -286,7 +286,7 @@ def test_topic_list_subscriptions_no_paging(self): self.assertIsInstance(subscription, dict) self.assertEqual(subscription['name'], self.SUB_PATH) self.assertEqual(subscription['topic'], self.TOPIC_PATH) - self.assertEqual(next_token, None) + self.assertIsNone(next_token) self.assertEqual(connection._called_with['method'], 'GET') path = '/%s' % (self.LIST_TOPIC_SUBSCRIPTIONS_PATH,) @@ -330,7 +330,7 @@ def test_topic_list_subscriptions_missing_key(self): self.TOPIC_PATH) self.assertEqual(len(subscriptions), 0) - self.assertEqual(next_token, None) + self.assertIsNone(next_token) self.assertEqual(connection._called_with['method'], 'GET') path = '/%s' % (self.LIST_TOPIC_SUBSCRIPTIONS_PATH,) @@ -378,7 +378,7 @@ def test_list_subscriptions_no_paging(self): self.assertIsInstance(subscription, dict) self.assertEqual(subscription['name'], self.SUB_PATH) self.assertEqual(subscription['topic'], self.TOPIC_PATH) - self.assertEqual(next_token, None) + self.assertIsNone(next_token) self.assertEqual(connection._called_with['method'], 'GET') path = '/%s' % (self.LIST_SUBSCRIPTIONS_PATH,) @@ -421,7 +421,7 @@ def test_list_subscriptions_missing_key(self): subscriptions, next_token = api.list_subscriptions(self.PROJECT) self.assertEqual(len(subscriptions), 0) - self.assertEqual(next_token, None) + self.assertIsNone(next_token) self.assertEqual(connection._called_with['method'], 'GET') path = '/%s' % (self.LIST_SUBSCRIPTIONS_PATH,) diff --git a/unit_tests/pubsub/test_iam.py b/unit_tests/pubsub/test_iam.py index d92cd641af04..4b350864d02e 100644 --- a/unit_tests/pubsub/test_iam.py +++ b/unit_tests/pubsub/test_iam.py @@ -26,8 +26,8 @@ def _makeOne(self, *args, **kw): def test_ctor_defaults(self): policy = self._makeOne() - self.assertEqual(policy.etag, None) - self.assertEqual(policy.version, None) + self.assertIsNone(policy.etag) + self.assertIsNone(policy.version) self.assertEqual(list(policy.owners), []) self.assertEqual(list(policy.editors), []) self.assertEqual(list(policy.viewers), []) @@ -85,7 +85,7 @@ def test_from_api_repr_only_etag(self): klass = self._getTargetClass() policy = klass.from_api_repr(RESOURCE) self.assertEqual(policy.etag, 'ACAB') - self.assertEqual(policy.version, None) + self.assertIsNone(policy.version) self.assertEqual(list(policy.owners), []) self.assertEqual(list(policy.editors), []) self.assertEqual(list(policy.viewers), []) diff --git a/unit_tests/pubsub/test_message.py b/unit_tests/pubsub/test_message.py index c9c798108116..fe7cc5e43591 100644 --- a/unit_tests/pubsub/test_message.py +++ b/unit_tests/pubsub/test_message.py @@ -31,7 +31,7 @@ def test_ctor_no_attributes(self): self.assertEqual(message.data, DATA) self.assertEqual(message.message_id, MESSAGE_ID) self.assertEqual(message.attributes, {}) - self.assertEqual(message.service_timestamp, None) + self.assertIsNone(message.service_timestamp) def test_ctor_w_attributes(self): DATA = b'DEADBEEF' @@ -42,7 +42,7 @@ def test_ctor_w_attributes(self): self.assertEqual(message.data, DATA) self.assertEqual(message.message_id, MESSAGE_ID) self.assertEqual(message.attributes, ATTRS) - self.assertEqual(message.service_timestamp, None) + self.assertIsNone(message.service_timestamp) def test_timestamp_no_attributes(self): DATA = b'DEADBEEF' @@ -87,7 +87,7 @@ def test_from_api_repr_missing_data(self): self.assertEqual(message.data, b'') self.assertEqual(message.message_id, MESSAGE_ID) self.assertEqual(message.attributes, {}) - self.assertEqual(message.service_timestamp, None) + self.assertIsNone(message.service_timestamp) def test_from_api_repr_no_attributes(self): from base64 import b64encode as b64 diff --git a/unit_tests/pubsub/test_subscription.py b/unit_tests/pubsub/test_subscription.py index 32b7b337e1da..f393656002c4 100644 --- a/unit_tests/pubsub/test_subscription.py +++ b/unit_tests/pubsub/test_subscription.py @@ -37,8 +37,8 @@ def test_ctor_defaults(self): subscription = self._makeOne(self.SUB_NAME, topic) self.assertEqual(subscription.name, self.SUB_NAME) self.assertIs(subscription.topic, topic) - self.assertEqual(subscription.ack_deadline, None) - self.assertEqual(subscription.push_endpoint, None) + self.assertIsNone(subscription.ack_deadline) + self.assertIsNone(subscription.push_endpoint) def test_ctor_explicit(self): client = _Client(project=self.PROJECT) @@ -262,8 +262,8 @@ def test_reload_w_alternate_client(self): subscription.reload(client=client2) - self.assertEqual(subscription.ack_deadline, None) - self.assertEqual(subscription.push_endpoint, None) + self.assertIsNone(subscription.ack_deadline) + self.assertIsNone(subscription.push_endpoint) self.assertEqual(api._subscription_got, self.SUB_PATH) def test_delete_w_bound_client(self): @@ -317,7 +317,7 @@ def test_modify_push_config_wo_endpoint_w_alternate_client(self): subscription.modify_push_configuration(push_endpoint=None, client=client2) - self.assertEqual(subscription.push_endpoint, None) + self.assertIsNone(subscription.push_endpoint) self.assertEqual(api._subscription_modified_push_config, (self.SUB_PATH, None)) @@ -507,7 +507,7 @@ def test_get_iam_policy_w_alternate_client(self): policy = subscription.get_iam_policy(client=client2) self.assertEqual(policy.etag, 'ACAB') - self.assertEqual(policy.version, None) + self.assertIsNone(policy.version) self.assertEqual(sorted(policy.owners), []) self.assertEqual(sorted(policy.editors), []) self.assertEqual(sorted(policy.viewers), []) @@ -585,7 +585,7 @@ def test_set_iam_policy_w_alternate_client(self): new_policy = subscription.set_iam_policy(policy, client=client2) self.assertEqual(new_policy.etag, 'ACAB') - self.assertEqual(new_policy.version, None) + self.assertIsNone(new_policy.version) self.assertEqual(sorted(new_policy.owners), []) self.assertEqual(sorted(new_policy.editors), []) self.assertEqual(sorted(new_policy.viewers), []) diff --git a/unit_tests/pubsub/test_topic.py b/unit_tests/pubsub/test_topic.py index 03f8a5e8abdd..4e06dedf8346 100644 --- a/unit_tests/pubsub/test_topic.py +++ b/unit_tests/pubsub/test_topic.py @@ -363,7 +363,7 @@ def test_list_subscriptions_with_paging(self): self.assertEqual(subscriptions[1].name, SUB_NAME_2) self.assertIs(subscription.topic, topic) - self.assertEqual(next_page_token, None) + self.assertIsNone(next_page_token) self.assertEqual(api._topic_listed, (self.TOPIC_PATH, PAGE_SIZE, TOKEN)) @@ -376,7 +376,7 @@ def test_list_subscriptions_missing_key(self): subscriptions, next_page_token = topic.list_subscriptions() self.assertEqual(len(subscriptions), 0) - self.assertEqual(next_page_token, None) + self.assertIsNone(next_page_token) self.assertEqual(api._topic_listed, (self.TOPIC_PATH, None, None)) @@ -439,7 +439,7 @@ def test_get_iam_policy_w_alternate_client(self): policy = topic.get_iam_policy(client=client2) self.assertEqual(policy.etag, 'ACAB') - self.assertEqual(policy.version, None) + self.assertIsNone(policy.version) self.assertEqual(sorted(policy.owners), []) self.assertEqual(sorted(policy.editors), []) self.assertEqual(sorted(policy.viewers), []) @@ -522,7 +522,7 @@ def test_set_iam_policy_w_alternate_client(self): new_policy = topic.set_iam_policy(policy, client=client2) self.assertEqual(new_policy.etag, 'ACAB') - self.assertEqual(new_policy.version, None) + self.assertIsNone(new_policy.version) self.assertEqual(sorted(new_policy.owners), []) self.assertEqual(sorted(new_policy.editors), []) self.assertEqual(sorted(new_policy.viewers), []) diff --git a/unit_tests/resource_manager/test_client.py b/unit_tests/resource_manager/test_client.py index 0999af48b6be..8c2ef35daa52 100644 --- a/unit_tests/resource_manager/test_client.py +++ b/unit_tests/resource_manager/test_client.py @@ -29,7 +29,7 @@ def test_constructor(self): iterator = self._makeOne(client) self.assertEqual(iterator.path, '/projects') self.assertEqual(iterator.page_number, 0) - self.assertEqual(iterator.next_page_token, None) + self.assertIsNone(iterator.next_page_token) self.assertIs(iterator.client, client) self.assertEqual(iterator.extra_params, {}) diff --git a/unit_tests/resource_manager/test_project.py b/unit_tests/resource_manager/test_project.py index 8535e2d81e13..65d6410733e0 100644 --- a/unit_tests/resource_manager/test_project.py +++ b/unit_tests/resource_manager/test_project.py @@ -30,10 +30,10 @@ def test_constructor_defaults(self): project = self._makeOne(PROJECT_ID, client) self.assertEqual(project.project_id, PROJECT_ID) self.assertEqual(project._client, client) - self.assertEqual(project.name, None) - self.assertEqual(project.number, None) + self.assertIsNone(project.name) + self.assertIsNone(project.number) self.assertEqual(project.labels, {}) - self.assertEqual(project.status, None) + self.assertIsNone(project.status) def test_constructor_explicit(self): client = object() @@ -45,9 +45,9 @@ def test_constructor_explicit(self): self.assertEqual(project.project_id, PROJECT_ID) self.assertEqual(project._client, client) self.assertEqual(project.name, DISPLAY_NAME) - self.assertEqual(project.number, None) + self.assertIsNone(project.number) self.assertEqual(project.labels, LABELS) - self.assertEqual(project.status, None) + self.assertIsNone(project.status) def test_from_api_repr(self): client = object() @@ -97,7 +97,7 @@ def test_create(self): connection = _Connection(PROJECT_RESOURCE) client = _Client(connection=connection) project = self._makeOne(PROJECT_ID, client) - self.assertEqual(project.number, None) + self.assertIsNone(project.number) project.create() self.assertEqual(project.number, PROJECT_NUMBER) request, = connection._requested @@ -126,10 +126,10 @@ def test_reload(self): connection = _Connection(PROJECT_RESOURCE) client = _Client(connection=connection) project = self._makeOne(PROJECT_ID, client) - self.assertEqual(project.number, None) - self.assertEqual(project.name, None) + self.assertIsNone(project.number) + self.assertIsNone(project.name) self.assertEqual(project.labels, {}) - self.assertEqual(project.status, None) + self.assertIsNone(project.status) project.reload() self.assertEqual(project.name, PROJECT_RESOURCE['name']) self.assertEqual(project.number, PROJECT_NUMBER) diff --git a/unit_tests/storage/test_acl.py b/unit_tests/storage/test_acl.py index 4efcdc6e62e7..e1585bc26c39 100644 --- a/unit_tests/storage/test_acl.py +++ b/unit_tests/storage/test_acl.py @@ -28,7 +28,7 @@ def test_ctor_default_identifier(self): TYPE = 'type' entity = self._makeOne(TYPE) self.assertEqual(entity.type, TYPE) - self.assertEqual(entity.identifier, None) + self.assertIsNone(entity.identifier) self.assertEqual(entity.get_roles(), set()) def test_ctor_w_identifier(self): @@ -211,7 +211,7 @@ def test_entity_from_dict_allUsers_eager(self): acl.loaded = True entity = acl.entity_from_dict({'entity': 'allUsers', 'role': ROLE}) self.assertEqual(entity.type, 'allUsers') - self.assertEqual(entity.identifier, None) + self.assertIsNone(entity.identifier) self.assertEqual(entity.get_roles(), set([ROLE])) self.assertEqual(list(acl), [{'entity': 'allUsers', 'role': ROLE}]) @@ -224,7 +224,7 @@ def test_entity_from_dict_allAuthenticatedUsers(self): entity = acl.entity_from_dict({'entity': 'allAuthenticatedUsers', 'role': ROLE}) self.assertEqual(entity.type, 'allAuthenticatedUsers') - self.assertEqual(entity.identifier, None) + self.assertIsNone(entity.identifier) self.assertEqual(entity.get_roles(), set([ROLE])) self.assertEqual(list(acl), [{'entity': 'allAuthenticatedUsers', 'role': ROLE}]) @@ -294,7 +294,7 @@ def test_has_entity_hit_entity(self): def test_get_entity_miss_str_no_default_eager(self): acl = self._makeOne() acl.loaded = True - self.assertEqual(acl.get_entity('nonesuch'), None) + self.assertIsNone(acl.get_entity('nonesuch')) def test_get_entity_miss_str_no_default_lazy(self): acl = self._makeOne() @@ -303,7 +303,7 @@ def _reload(): acl.loaded = True acl.reload = _reload - self.assertEqual(acl.get_entity('nonesuch'), None) + self.assertIsNone(acl.get_entity('nonesuch')) self.assertTrue(acl.loaded) def test_get_entity_miss_entity_no_default(self): @@ -313,7 +313,7 @@ def test_get_entity_miss_entity_no_default(self): entity = _ACLEntity(TYPE, ID) acl = self._makeOne() acl.loaded = True - self.assertEqual(acl.get_entity(entity), None) + self.assertIsNone(acl.get_entity(entity)) def test_get_entity_miss_str_w_default(self): DEFAULT = object() @@ -471,7 +471,7 @@ def test_all(self): entity = acl.all() entity.grant(ROLE) self.assertEqual(entity.type, 'allUsers') - self.assertEqual(entity.identifier, None) + self.assertIsNone(entity.identifier) self.assertEqual(list(acl), [{'entity': 'allUsers', 'role': ROLE}]) @@ -482,7 +482,7 @@ def test_all_authenticated(self): entity = acl.all_authenticated() entity.grant(ROLE) self.assertEqual(entity.type, 'allAuthenticatedUsers') - self.assertEqual(entity.identifier, None) + self.assertIsNone(entity.identifier) self.assertEqual(list(acl), [{'entity': 'allAuthenticatedUsers', 'role': ROLE}]) diff --git a/unit_tests/storage/test_batch.py b/unit_tests/storage/test_batch.py index ee2c8f1fccf6..37453f1582ce 100644 --- a/unit_tests/storage/test_batch.py +++ b/unit_tests/storage/test_batch.py @@ -123,7 +123,7 @@ def test__make_request_GET_normal(self): headers = solo_request[2] for key, value in EXPECTED_HEADERS: self.assertEqual(headers[key], value) - self.assertEqual(solo_request[3], None) + self.assertIsNone(solo_request[3]) def test__make_request_POST_normal(self): from google.cloud.storage.batch import _FutureDict @@ -198,7 +198,7 @@ def test__make_request_DELETE_normal(self): headers = solo_request[2] for key, value in EXPECTED_HEADERS: self.assertEqual(headers[key], value) - self.assertEqual(solo_request[3], None) + self.assertIsNone(solo_request[3]) def test__make_request_POST_too_many_requests(self): URL = 'http://example.com/api' diff --git a/unit_tests/storage/test_blob.py b/unit_tests/storage/test_blob.py index db11f856d164..001ae026851f 100644 --- a/unit_tests/storage/test_blob.py +++ b/unit_tests/storage/test_blob.py @@ -47,7 +47,7 @@ def test_chunk_size_getter(self): BLOB_NAME = 'blob-name' BUCKET = object() blob = self._makeOne(BLOB_NAME, bucket=BUCKET) - self.assertEqual(blob.chunk_size, None) + self.assertIsNone(blob.chunk_size) VALUE = object() blob._chunk_size = VALUE self.assertIs(blob.chunk_size, VALUE) @@ -56,7 +56,7 @@ def test_chunk_size_setter(self): BLOB_NAME = 'blob-name' BUCKET = object() blob = self._makeOne(BLOB_NAME, bucket=BUCKET) - self.assertEqual(blob._chunk_size, None) + self.assertIsNone(blob._chunk_size) blob._CHUNK_SIZE_MULTIPLE = 10 blob.chunk_size = 20 self.assertEqual(blob._chunk_size, 20) @@ -65,7 +65,7 @@ def test_chunk_size_setter_bad_value(self): BLOB_NAME = 'blob-name' BUCKET = object() blob = self._makeOne(BLOB_NAME, bucket=BUCKET) - self.assertEqual(blob._chunk_size, None) + self.assertIsNone(blob._chunk_size) blob._CHUNK_SIZE_MULTIPLE = 10 with self.assertRaises(ValueError): blob.chunk_size = 11 @@ -811,7 +811,7 @@ def test_upload_from_file_w_slash_in_name(self): self.assertEqual(len(rq), 1) self.assertEqual(rq[0]['redirections'], 5) self.assertEqual(rq[0]['body'], DATA) - self.assertEqual(rq[0]['connection_type'], None) + self.assertIsNone(rq[0]['connection_type']) self.assertEqual(rq[0]['method'], 'POST') uri = rq[0]['uri'] scheme, netloc, path, qs, _ = urlsplit(uri) @@ -1115,7 +1115,7 @@ def test_cache_control_setter(self): CACHE_CONTROL = 'no-cache' bucket = _Bucket() blob = self._makeOne(BLOB_NAME, bucket=bucket) - self.assertEqual(blob.cache_control, None) + self.assertIsNone(blob.cache_control) blob.cache_control = CACHE_CONTROL self.assertEqual(blob.cache_control, CACHE_CONTROL) @@ -1129,7 +1129,7 @@ def test_component_count(self): def test_component_count_unset(self): BUCKET = object() blob = self._makeOne('blob-name', bucket=BUCKET) - self.assertEqual(blob.component_count, None) + self.assertIsNone(blob.component_count) def test_component_count_string_val(self): BUCKET = object() @@ -1152,7 +1152,7 @@ def test_content_disposition_setter(self): CONTENT_DISPOSITION = 'Attachment; filename=example.jpg' bucket = _Bucket() blob = self._makeOne(BLOB_NAME, bucket=bucket) - self.assertEqual(blob.content_disposition, None) + self.assertIsNone(blob.content_disposition) blob.content_disposition = CONTENT_DISPOSITION self.assertEqual(blob.content_disposition, CONTENT_DISPOSITION) @@ -1169,7 +1169,7 @@ def test_content_encoding_setter(self): CONTENT_ENCODING = 'gzip' bucket = _Bucket() blob = self._makeOne(BLOB_NAME, bucket=bucket) - self.assertEqual(blob.content_encoding, None) + self.assertIsNone(blob.content_encoding) blob.content_encoding = CONTENT_ENCODING self.assertEqual(blob.content_encoding, CONTENT_ENCODING) @@ -1186,7 +1186,7 @@ def test_content_language_setter(self): CONTENT_LANGUAGE = 'pt-BR' bucket = _Bucket() blob = self._makeOne(BLOB_NAME, bucket=bucket) - self.assertEqual(blob.content_language, None) + self.assertIsNone(blob.content_language) blob.content_language = CONTENT_LANGUAGE self.assertEqual(blob.content_language, CONTENT_LANGUAGE) @@ -1203,7 +1203,7 @@ def test_content_type_setter(self): CONTENT_TYPE = 'image/jpeg' bucket = _Bucket() blob = self._makeOne(BLOB_NAME, bucket=bucket) - self.assertEqual(blob.content_type, None) + self.assertIsNone(blob.content_type) blob.content_type = CONTENT_TYPE self.assertEqual(blob.content_type, CONTENT_TYPE) @@ -1220,7 +1220,7 @@ def test_crc32c_setter(self): CRC32C = 'DEADBEEF' bucket = _Bucket() blob = self._makeOne(BLOB_NAME, bucket=bucket) - self.assertEqual(blob.crc32c, None) + self.assertIsNone(blob.crc32c) blob.crc32c = CRC32C self.assertEqual(blob.crc32c, CRC32C) @@ -1242,7 +1242,7 @@ def test_generation(self): def test_generation_unset(self): BUCKET = object() blob = self._makeOne('blob-name', bucket=BUCKET) - self.assertEqual(blob.generation, None) + self.assertIsNone(blob.generation) def test_generation_string_val(self): BUCKET = object() @@ -1272,7 +1272,7 @@ def test_md5_hash_setter(self): MD5_HASH = 'DEADBEEF' bucket = _Bucket() blob = self._makeOne(BLOB_NAME, bucket=bucket) - self.assertEqual(blob.md5_hash, None) + self.assertIsNone(blob.md5_hash) blob.md5_hash = MD5_HASH self.assertEqual(blob.md5_hash, MD5_HASH) @@ -1297,7 +1297,7 @@ def test_metadata_setter(self): METADATA = {'foo': 'Foo'} bucket = _Bucket() blob = self._makeOne(BLOB_NAME, bucket=bucket) - self.assertEqual(blob.metadata, None) + self.assertIsNone(blob.metadata) blob.metadata = METADATA self.assertEqual(blob.metadata, METADATA) @@ -1311,7 +1311,7 @@ def test_metageneration(self): def test_metageneration_unset(self): BUCKET = object() blob = self._makeOne('blob-name', bucket=BUCKET) - self.assertEqual(blob.metageneration, None) + self.assertIsNone(blob.metageneration) def test_metageneration_string_val(self): BUCKET = object() @@ -1349,7 +1349,7 @@ def test_size(self): def test_size_unset(self): BUCKET = object() blob = self._makeOne('blob-name', bucket=BUCKET) - self.assertEqual(blob.size, None) + self.assertIsNone(blob.size) def test_size_string_val(self): BUCKET = object() @@ -1381,7 +1381,7 @@ def test_time_deleted(self): def test_time_deleted_unset(self): BUCKET = object() blob = self._makeOne('blob-name', bucket=BUCKET) - self.assertEqual(blob.time_deleted, None) + self.assertIsNone(blob.time_deleted) def test_updated(self): import datetime @@ -1398,7 +1398,7 @@ def test_updated(self): def test_updated_unset(self): BUCKET = object() blob = self._makeOne('blob-name', bucket=BUCKET) - self.assertEqual(blob.updated, None) + self.assertIsNone(blob.updated) class _Responder(object): diff --git a/unit_tests/storage/test_bucket.py b/unit_tests/storage/test_bucket.py index 0e4f1e5d11bc..258633c74ec7 100644 --- a/unit_tests/storage/test_bucket.py +++ b/unit_tests/storage/test_bucket.py @@ -33,7 +33,7 @@ def test_ctor(self): self.assertIs(iterator.client, client) self.assertEqual(iterator.path, '%s/o' % bucket.path) self.assertEqual(iterator.page_number, 0) - self.assertEqual(iterator.next_page_token, None) + self.assertIsNone(iterator.next_page_token) self.assertEqual(iterator.prefixes, set()) def test_get_items_from_response_empty(self): @@ -605,7 +605,7 @@ def test_location_getter(self): def test_location_setter(self): NAME = 'name' bucket = self._makeOne(name=NAME) - self.assertEqual(bucket.location, None) + self.assertIsNone(bucket.location) bucket.location = 'AS' self.assertEqual(bucket.location, 'AS') self.assertTrue('location' in bucket._changes) @@ -716,7 +716,7 @@ def test_metageneration(self): def test_metageneration_unset(self): bucket = self._makeOne() - self.assertEqual(bucket.metageneration, None) + self.assertIsNone(bucket.metageneration) def test_metageneration_string_val(self): METAGENERATION = 42 @@ -740,7 +740,7 @@ def test_project_number(self): def test_project_number_unset(self): bucket = self._makeOne() - self.assertEqual(bucket.project_number, None) + self.assertIsNone(bucket.project_number) def test_project_number_string_val(self): PROJECT_NUMBER = 12345 @@ -800,7 +800,7 @@ def test_time_created(self): def test_time_created_unset(self): bucket = self._makeOne() - self.assertEqual(bucket.time_created, None) + self.assertIsNone(bucket.time_created) def test_versioning_enabled_getter_missing(self): NAME = 'name' diff --git a/unit_tests/storage/test_client.py b/unit_tests/storage/test_client.py index 7eec3b2e2e35..d8a0d466166c 100644 --- a/unit_tests/storage/test_client.py +++ b/unit_tests/storage/test_client.py @@ -181,7 +181,7 @@ def test_lookup_bucket_miss(self): b'{}', ) bucket = client.lookup_bucket(NONESUCH) - self.assertEqual(bucket, None) + self.assertIsNone(bucket) self.assertEqual(http._called_with['method'], 'GET') self.assertEqual(http._called_with['uri'], URI) @@ -278,7 +278,7 @@ def test_list_buckets_empty(self): buckets = list(client.list_buckets()) self.assertEqual(len(buckets), 0) self.assertEqual(http._called_with['method'], 'GET') - self.assertEqual(http._called_with['body'], None) + self.assertIsNone(http._called_with['body']) BASE_URI = '/'.join([ client.connection.API_BASE_URL, @@ -356,7 +356,7 @@ def test_list_buckets_all_arguments(self): buckets = list(iterator) self.assertEqual(buckets, []) self.assertEqual(http._called_with['method'], 'GET') - self.assertEqual(http._called_with['body'], None) + self.assertIsNone(http._called_with['body']) BASE_URI = '/'.join([ client.connection.API_BASE_URL, @@ -385,7 +385,7 @@ def test_ctor(self): iterator = self._makeOne(client) self.assertEqual(iterator.path, '/b') self.assertEqual(iterator.page_number, 0) - self.assertEqual(iterator.next_page_token, None) + self.assertIsNone(iterator.next_page_token) self.assertIs(iterator.client, client) def test_get_items_from_response_empty(self): diff --git a/unit_tests/streaming/test_http_wrapper.py b/unit_tests/streaming/test_http_wrapper.py index 6302d9c4b585..fc971cbdf387 100644 --- a/unit_tests/streaming/test_http_wrapper.py +++ b/unit_tests/streaming/test_http_wrapper.py @@ -75,7 +75,7 @@ def test_ctor_defaults(self): self.assertEqual(request.http_method, 'GET') self.assertEqual(request.headers, {'content-length': '0'}) self.assertEqual(request.body, '') - self.assertEqual(request.loggable_body, None) + self.assertIsNone(request.loggable_body) def test_loggable_body_setter_w_body_None(self): from google.cloud.streaming.exceptions import RequestError @@ -88,7 +88,7 @@ def test_body_setter_w_None(self): request.loggable_body = 'abc' request.body = None self.assertEqual(request.headers, {}) - self.assertEqual(request.body, None) + self.assertIsNone(request.body) self.assertEqual(request.loggable_body, 'abc') def test_body_setter_w_non_string(self): @@ -116,7 +116,7 @@ def test_ctor(self): response = self._makeOne(info, CONTENT, URL) self.assertEqual(len(response), len(CONTENT)) self.assertEqual(response.status_code, 200) - self.assertEqual(response.retry_after, None) + self.assertIsNone(response.retry_after) self.assertFalse(response.is_redirect) def test_length_w_content_encoding_w_content_range(self): diff --git a/unit_tests/streaming/test_transfer.py b/unit_tests/streaming/test_transfer.py index b198b9e6e39a..96426404b2c5 100644 --- a/unit_tests/streaming/test_transfer.py +++ b/unit_tests/streaming/test_transfer.py @@ -462,7 +462,7 @@ def test__process_response_w_OK_wo_encoding(self): self.assertIs(found, response) self.assertEqual(stream._written, ['OK']) self.assertEqual(download.progress, 2) - self.assertEqual(download.encoding, None) + self.assertIsNone(download.encoding) def test__process_response_w_PARTIAL_CONTENT_w_encoding(self): from six.moves import http_client @@ -486,7 +486,7 @@ def test__process_response_w_REQUESTED_RANGE_NOT_SATISFIABLE(self): self.assertIs(found, response) self.assertEqual(stream._written, []) self.assertEqual(download.progress, 0) - self.assertEqual(download.encoding, None) + self.assertIsNone(download.encoding) def test__process_response_w_NO_CONTENT(self): from six.moves import http_client @@ -497,7 +497,7 @@ def test__process_response_w_NO_CONTENT(self): self.assertIs(found, response) self.assertEqual(stream._written, ['']) self.assertEqual(download.progress, 0) - self.assertEqual(download.encoding, None) + self.assertIsNone(download.encoding) def test_get_range_not_initialized(self): from google.cloud.streaming.exceptions import TransferInvalidError @@ -875,7 +875,7 @@ def test_from_stream_defaults(self): upload = klass.from_stream(stream, mime_type=self.MIME_TYPE) self.assertEqual(upload.mime_type, self.MIME_TYPE) self.assertTrue(upload.auto_transfer) - self.assertEqual(upload.total_size, None) + self.assertIsNone(upload.total_size) def test_from_stream_explicit(self): klass = self._getTargetClass() @@ -1319,7 +1319,7 @@ def test_initialize_upload_w_http_wo_auto_transfer_w_OK(self): with _Monkey(MUT, make_api_request=requester): upload.initialize_upload(request, http=object()) - self.assertEqual(upload._server_chunk_granularity, None) + self.assertIsNone(upload._server_chunk_granularity) self.assertEqual(upload.url, self.UPLOAD_URL) self.assertEqual(requester._responses, []) self.assertEqual(len(requester._requested), 1) @@ -1711,7 +1711,7 @@ def test__send_chunk_wo_total_size_stream_exhausted(self): response = object() streamer = _MediaStreamer(response) upload._send_media_request = streamer - self.assertEqual(upload.total_size, None) + self.assertIsNone(upload.total_size) found = upload._send_chunk(0) @@ -1737,12 +1737,12 @@ def test__send_chunk_wo_total_size_stream_not_exhausted(self): response = object() streamer = _MediaStreamer(response) upload._send_media_request = streamer - self.assertEqual(upload.total_size, None) + self.assertIsNone(upload.total_size) found = upload._send_chunk(0) self.assertIs(found, response) - self.assertEqual(upload.total_size, None) + self.assertIsNone(upload.total_size) request, end = streamer._called_with self.assertEqual(request.url, self.UPLOAD_URL) self.assertEqual(request.http_method, 'PUT') diff --git a/unit_tests/test__helpers.py b/unit_tests/test__helpers.py index 6b0c83e3b43c..3a2950c42bbd 100644 --- a/unit_tests/test__helpers.py +++ b/unit_tests/test__helpers.py @@ -73,7 +73,7 @@ def test_fromutc(self): import datetime naive_epoch = datetime.datetime.utcfromtimestamp(0) - self.assertEqual(naive_epoch.tzinfo, None) + self.assertIsNone(naive_epoch.tzinfo) tz = self._makeOne() epoch = tz.fromutc(naive_epoch) self.assertEqual(epoch.tzinfo, tz) @@ -136,7 +136,7 @@ def test_no_value(self): with _Monkey(_helpers, app_identity=None): dataset_id = self._callFUT() - self.assertEqual(dataset_id, None) + self.assertIsNone(dataset_id) def test_value_set(self): from unit_tests._testing import _Monkey @@ -309,7 +309,7 @@ def test_bad_status(self): connection = _HTTPConnection(404, None) with self._monkeyConnection(connection): dataset_id = self._callFUT() - self.assertEqual(dataset_id, None) + self.assertIsNone(dataset_id) def test_success(self): COMPUTE_ENGINE_ID = object() @@ -322,7 +322,7 @@ def test_socket_raises(self): connection = _TimeoutHTTPConnection() with self._monkeyConnection(connection): dataset_id = self._callFUT() - self.assertEqual(dataset_id, None) + self.assertIsNone(dataset_id) class Test__get_production_project(unittest.TestCase): @@ -337,7 +337,7 @@ def test_no_value(self): environ = {} with _Monkey(os, getenv=environ.get): project = self._callFUT() - self.assertEqual(project, None) + self.assertIsNone(project) def test_value_set(self): from unit_tests._testing import _Monkey @@ -398,7 +398,7 @@ def gce_mock(): def test_no_value(self): project, callers = self._determine_default_helper() - self.assertEqual(project, None) + self.assertIsNone(project) self.assertEqual(callers, ['prod_mock', 'file_id_mock', 'srv_id_mock', 'gae_mock', 'gce_mock']) @@ -894,7 +894,7 @@ def callback(*args): cb_headers = [ ('authorization', 'Bearer ' + access_token_expected), ] - self.assertEqual(result, None) + self.assertIsNone(result) self.assertEqual(callback_args, [(cb_headers, None)]) self.assertEqual(len(credentials._tokens), 1) diff --git a/unit_tests/test_connection.py b/unit_tests/test_connection.py index e252f47d6b39..fefdb00f9f1b 100644 --- a/unit_tests/test_connection.py +++ b/unit_tests/test_connection.py @@ -26,7 +26,7 @@ def _makeOne(self, *args, **kw): def test_ctor_defaults(self): conn = self._makeOne() - self.assertEqual(conn.credentials, None) + self.assertIsNone(conn.credentials) def test_ctor_explicit(self): credentials = _Credentials() @@ -34,19 +34,19 @@ def test_ctor_explicit(self): conn = self._makeOne(credentials) self.assertEqual(credentials._create_scoped_calls, 1) self.assertIs(conn.credentials, credentials) - self.assertEqual(conn._http, None) + self.assertIsNone(conn._http) def test_ctor_explicit_http(self): http = object() conn = self._makeOne(http=http) - self.assertEqual(conn.credentials, None) + self.assertIsNone(conn.credentials) self.assertIs(conn.http, http) def test_ctor_credentials_wo_create_scoped(self): credentials = object() conn = self._makeOne(credentials) self.assertIs(conn.credentials, credentials) - self.assertEqual(conn._http, None) + self.assertIsNone(conn._http) def test_http_w_existing(self): conn = self._makeOne() @@ -99,7 +99,7 @@ def test_class_defaults(self): def test_ctor_defaults(self): conn = self._makeOne() - self.assertEqual(conn.credentials, None) + self.assertIsNone(conn.credentials) def test_ctor_explicit(self): credentials = _Credentials() @@ -168,7 +168,7 @@ def test__make_request_no_data_no_content_type_no_headers(self): self.assertEqual(content, b'') self.assertEqual(http._called_with['method'], 'GET') self.assertEqual(http._called_with['uri'], URI) - self.assertEqual(http._called_with['body'], None) + self.assertIsNone(http._called_with['body']) expected_headers = { 'Accept-Encoding': 'gzip', 'Content-Length': '0', @@ -205,7 +205,7 @@ def test__make_request_w_extra_headers(self): conn._make_request('GET', URI, headers={'X-Foo': 'foo'}) self.assertEqual(http._called_with['method'], 'GET') self.assertEqual(http._called_with['uri'], URI) - self.assertEqual(http._called_with['body'], None) + self.assertIsNone(http._called_with['body']) expected_headers = { 'Accept-Encoding': 'gzip', 'Content-Length': '0', @@ -230,7 +230,7 @@ def test_api_request_defaults(self): self.assertEqual(conn.api_request('GET', PATH), {}) self.assertEqual(http._called_with['method'], 'GET') self.assertEqual(http._called_with['uri'], URI) - self.assertEqual(http._called_with['body'], None) + self.assertIsNone(http._called_with['body']) expected_headers = { 'Accept-Encoding': 'gzip', 'Content-Length': '0', @@ -279,7 +279,7 @@ def test_api_request_w_query_params(self): self.assertEqual(path, PATH) parms = dict(parse_qsl(qs)) self.assertEqual(parms['foo'], 'bar') - self.assertEqual(http._called_with['body'], None) + self.assertIsNone(http._called_with['body']) expected_headers = { 'Accept-Encoding': 'gzip', 'Content-Length': '0', @@ -350,7 +350,7 @@ def test_api_request_non_binary_response(self): self.assertEqual(result, {}) self.assertEqual(http._called_with['method'], 'GET') self.assertEqual(http._called_with['uri'], URI) - self.assertEqual(http._called_with['body'], None) + self.assertIsNone(http._called_with['body']) expected_headers = { 'Accept-Encoding': 'gzip', 'Content-Length': '0', diff --git a/unit_tests/test_iterator.py b/unit_tests/test_iterator.py index ca033aa93d2e..fb647ec7709b 100644 --- a/unit_tests/test_iterator.py +++ b/unit_tests/test_iterator.py @@ -32,7 +32,7 @@ def test_ctor(self): self.assertIs(iterator.client, client) self.assertEqual(iterator.path, PATH) self.assertEqual(iterator.page_number, 0) - self.assertEqual(iterator.next_page_token, None) + self.assertIsNone(iterator.next_page_token) def test___iter__(self): PATH = '/foo' @@ -161,7 +161,7 @@ def test_reset(self): iterator.next_page_token = TOKEN iterator.reset() self.assertEqual(iterator.page_number, 0) - self.assertEqual(iterator.next_page_token, None) + self.assertIsNone(iterator.next_page_token) def test_get_items_from_response_raises_NotImplementedError(self): PATH = '/foo' @@ -185,10 +185,10 @@ def test_ctor_defaults(self): wlm = _WithListMethod() iterator = self._makeOne(wlm.list_foo) self.assertEqual(iterator._method, wlm.list_foo) - self.assertEqual(iterator._token, None) - self.assertEqual(iterator._page_size, None) + self.assertIsNone(iterator._token) + self.assertIsNone(iterator._page_size) self.assertEqual(iterator._kw, {}) - self.assertEqual(iterator._max_calls, None) + self.assertIsNone(iterator._max_calls) self.assertEqual(iterator._page_num, 0) def test_ctor_explicit(self): @@ -216,10 +216,10 @@ def test___iter___defaults(self): self.assertEqual(len(wlm._called_with), len(found) // 10) for i, (token, size, kw) in enumerate(wlm._called_with): if i == 0: - self.assertEqual(token, None) + self.assertIsNone(token) else: self.assertEqual(token, string.printable[i * 10:]) - self.assertEqual(size, None) + self.assertIsNone(size) self.assertEqual(kw, {}) def test___iter___explicit_size_and_maxcalls_and_kw(self): @@ -234,7 +234,7 @@ def test___iter___explicit_size_and_maxcalls_and_kw(self): self.assertEqual(len(wlm._called_with), len(found) // 2) for i, (token, size, kw) in enumerate(wlm._called_with): if i == 0: - self.assertEqual(token, None) + self.assertIsNone(token) else: self.assertEqual(token, string.printable[i * 2:]) self.assertEqual(size, 2) From 206045fffecbe9090daedd7d2f1c28cba2d73031 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 20 Sep 2016 12:04:12 -0700 Subject: [PATCH 9/9] Manually fixing some system test asserts broken by the auto scripts. --- system_tests/datastore.py | 2 +- system_tests/storage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system_tests/datastore.py b/system_tests/datastore.py index 97f757abf59d..518db17e38db 100644 --- a/system_tests/datastore.py +++ b/system_tests/datastore.py @@ -264,7 +264,7 @@ def test_limit_queries(self): self.assertEqual(len(character_entities), limit) # Check cursor after fetch. - self.assertIs(cursor, not None) + self.assertIsNotNone(cursor) # Fetch remaining of characters. new_character_entities = list(iterator) diff --git a/system_tests/storage.py b/system_tests/storage.py index a3903830347c..381f5668878e 100644 --- a/system_tests/storage.py +++ b/system_tests/storage.py @@ -261,7 +261,7 @@ def test_paginate_files(self): blobs = list(iterator.get_items_from_response(response)) self.assertEqual(len(blobs), count) self.assertEqual(iterator.page_number, 1) - self.assertIs(iterator.next_page_token, not None) + self.assertIsNotNone(iterator.next_page_token) response = iterator.get_next_page_response() last_blobs = list(iterator.get_items_from_response(response))