Skip to content

Commit 34bf003

Browse files
dhermesdhermes
authored
Using assertIs in unit tests where appropriate. (googleapis#3629)
* Using assertIs in unit tests where appropriate. Any usage of `self.assertTrue(a is b)` has become `self.assertIs(a, b)`. * Converting some assertFalse(a is b) to assertIsNot(a, b).
1 parent 827b41a commit 34bf003

File tree

10 files changed

+57
-57
lines changed

10 files changed

+57
-57
lines changed

‎spanner/tests/unit/test__helpers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ def _make_one(self, session):
512512
def test_ctor(self):
513513
session = object()
514514
base = self._make_one(session)
515-
self.assertTrue(base._session is session)
515+
self.assertIs(base._session, session)
516516

517517

518518
class Test_options_with_prefix(unittest.TestCase):

‎spanner/tests/unit/test_batch.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def _compare_values(self, result, source):
6565
def test_ctor(self):
6666
session = _Session()
6767
base = self._make_one(session)
68-
self.assertTrue(base._session is session)
68+
self.assertIs(base._session, session)
6969
self.assertEqual(len(base._mutations), 0)
7070

7171
def test__check_state_virtual(self):
@@ -177,7 +177,7 @@ def _getTargetClass(self):
177177
def test_ctor(self):
178178
session = _Session()
179179
batch = self._make_one(session)
180-
self.assertTrue(batch._session is session)
180+
self.assertIs(batch._session, session)
181181

182182
def test_commit_already_committed(self):
183183
from google.cloud.spanner.keyset import KeySet

‎spanner/tests/unit/test_client.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def _constructor_test_helper(self, expected_scopes, creds,
6060
expected_creds = expected_creds or creds.with_scopes.return_value
6161
self.assertIs(client._credentials, expected_creds)
6262

63-
self.assertTrue(client._credentials is expected_creds)
63+
self.assertIs(client._credentials, expected_creds)
6464
if expected_scopes is not None:
6565
creds.with_scopes.assert_called_once_with(expected_scopes)
6666

@@ -162,7 +162,7 @@ def __init__(self, *args, **kwargs):
162162

163163
self.assertTrue(isinstance(api, _Client))
164164
again = client.instance_admin_api
165-
self.assertTrue(again is api)
165+
self.assertIs(again, api)
166166
self.assertEqual(api.kwargs['lib_name'], 'gccl')
167167
self.assertIs(api.kwargs['credentials'], client.credentials)
168168

@@ -183,7 +183,7 @@ def __init__(self, *args, **kwargs):
183183

184184
self.assertTrue(isinstance(api, _Client))
185185
again = client.database_admin_api
186-
self.assertTrue(again is api)
186+
self.assertIs(again, api)
187187
self.assertEqual(api.kwargs['lib_name'], 'gccl')
188188
self.assertIs(api.kwargs['credentials'], client.credentials)
189189

@@ -202,7 +202,7 @@ def test_copy(self):
202202
def test_credentials_property(self):
203203
credentials = _Credentials()
204204
client = self._make_one(project=self.PROJECT, credentials=credentials)
205-
self.assertTrue(client.credentials is credentials)
205+
self.assertIs(client.credentials, credentials)
206206

207207
def test_project_name_property(self):
208208
credentials = _Credentials()
@@ -236,7 +236,7 @@ def test_list_instance_configs_wo_paging(self):
236236
project, page_size, options = api._listed_instance_configs
237237
self.assertEqual(project, self.PATH)
238238
self.assertEqual(page_size, None)
239-
self.assertTrue(options.page_token is INITIAL_PAGE)
239+
self.assertIs(options.page_token, INITIAL_PAGE)
240240
self.assertEqual(
241241
options.kwargs['metadata'],
242242
[('google-cloud-resource-prefix', client.project_name)])
@@ -292,7 +292,7 @@ def test_instance_factory_defaults(self):
292292
self.assertIsNone(instance.configuration_name)
293293
self.assertEqual(instance.display_name, self.INSTANCE_ID)
294294
self.assertEqual(instance.node_count, DEFAULT_NODE_COUNT)
295-
self.assertTrue(instance._client is client)
295+
self.assertIs(instance._client, client)
296296

297297
def test_instance_factory_explicit(self):
298298
from google.cloud.spanner.instance import Instance
@@ -309,7 +309,7 @@ def test_instance_factory_explicit(self):
309309
self.assertEqual(instance.configuration_name, self.CONFIGURATION_NAME)
310310
self.assertEqual(instance.display_name, self.DISPLAY_NAME)
311311
self.assertEqual(instance.node_count, self.NODE_COUNT)
312-
self.assertTrue(instance._client is client)
312+
self.assertIs(instance._client, client)
313313

314314
def test_list_instances_wo_paging(self):
315315
from google.cloud._testing import _GAXPageIterator
@@ -342,7 +342,7 @@ def test_list_instances_wo_paging(self):
342342
self.assertEqual(project, self.PATH)
343343
self.assertEqual(filter_, 'name:TEST')
344344
self.assertEqual(page_size, None)
345-
self.assertTrue(options.page_token is INITIAL_PAGE)
345+
self.assertIs(options.page_token, INITIAL_PAGE)
346346
self.assertEqual(
347347
options.kwargs['metadata'],
348348
[('google-cloud-resource-prefix', client.project_name)])

‎spanner/tests/unit/test_database.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def test_ctor_defaults(self):
5050
database = self._make_one(self.DATABASE_ID, instance)
5151

5252
self.assertEqual(database.database_id, self.DATABASE_ID)
53-
self.assertTrue(database._instance is instance)
53+
self.assertIs(database._instance, instance)
5454
self.assertEqual(list(database.ddl_statements), [])
5555
self.assertIsInstance(database._pool, BurstyPool)
5656
# BurstyPool does not create sessions during 'bind()'.
@@ -61,7 +61,7 @@ def test_ctor_w_explicit_pool(self):
6161
pool = _Pool()
6262
database = self._make_one(self.DATABASE_ID, instance, pool=pool)
6363
self.assertEqual(database.database_id, self.DATABASE_ID)
64-
self.assertTrue(database._instance is instance)
64+
self.assertIs(database._instance, instance)
6565
self.assertEqual(list(database.ddl_statements), [])
6666
self.assertIs(database._pool, pool)
6767
self.assertIs(pool._bound, database)
@@ -89,7 +89,7 @@ def test_ctor_w_ddl_statements_ok(self):
8989
self.DATABASE_ID, instance, ddl_statements=DDL_STATEMENTS,
9090
pool=pool)
9191
self.assertEqual(database.database_id, self.DATABASE_ID)
92-
self.assertTrue(database._instance is instance)
92+
self.assertIs(database._instance, instance)
9393
self.assertEqual(list(database.ddl_statements), DDL_STATEMENTS)
9494

9595
def test_from_pb_bad_database_name(self):
@@ -196,10 +196,10 @@ def _mock_spanner_client(*args, **kwargs):
196196

197197
with _Monkey(MUT, SpannerClient=_mock_spanner_client):
198198
api = database.spanner_api
199-
self.assertTrue(api is _client)
199+
self.assertIs(api, _client)
200200
# API instance is cached
201201
again = database.spanner_api
202-
self.assertTrue(again is api)
202+
self.assertIs(again, api)
203203

204204
def test___eq__(self):
205205
instance = _Instance(self.INSTANCE_NAME)
@@ -567,8 +567,8 @@ def test_session_factory(self):
567567
session = database.session()
568568

569569
self.assertTrue(isinstance(session, Session))
570-
self.assertTrue(session.session_id is None)
571-
self.assertTrue(session._database is database)
570+
self.assertIs(session.session_id, None)
571+
self.assertIs(session._database, database)
572572

573573
def test_execute_sql_defaults(self):
574574
QUERY = 'SELECT * FROM employees'
@@ -671,7 +671,7 @@ def test_batch(self):
671671

672672
checkout = database.batch()
673673
self.assertIsInstance(checkout, BatchCheckout)
674-
self.assertTrue(checkout._database is database)
674+
self.assertIs(checkout._database, database)
675675

676676
def test_snapshot_defaults(self):
677677
from google.cloud.spanner.database import SnapshotCheckout
@@ -685,7 +685,7 @@ def test_snapshot_defaults(self):
685685

686686
checkout = database.snapshot()
687687
self.assertIsInstance(checkout, SnapshotCheckout)
688-
self.assertTrue(checkout._database is database)
688+
self.assertIs(checkout._database, database)
689689
self.assertIsNone(checkout._read_timestamp)
690690
self.assertIsNone(checkout._min_read_timestamp)
691691
self.assertIsNone(checkout._max_staleness)
@@ -707,7 +707,7 @@ def test_snapshot_w_read_timestamp(self):
707707
checkout = database.snapshot(read_timestamp=now)
708708

709709
self.assertIsInstance(checkout, SnapshotCheckout)
710-
self.assertTrue(checkout._database is database)
710+
self.assertIs(checkout._database, database)
711711
self.assertEqual(checkout._read_timestamp, now)
712712
self.assertIsNone(checkout._min_read_timestamp)
713713
self.assertIsNone(checkout._max_staleness)
@@ -729,7 +729,7 @@ def test_snapshot_w_min_read_timestamp(self):
729729
checkout = database.snapshot(min_read_timestamp=now)
730730

731731
self.assertIsInstance(checkout, SnapshotCheckout)
732-
self.assertTrue(checkout._database is database)
732+
self.assertIs(checkout._database, database)
733733
self.assertIsNone(checkout._read_timestamp)
734734
self.assertEqual(checkout._min_read_timestamp, now)
735735
self.assertIsNone(checkout._max_staleness)
@@ -750,7 +750,7 @@ def test_snapshot_w_max_staleness(self):
750750
checkout = database.snapshot(max_staleness=staleness)
751751

752752
self.assertIsInstance(checkout, SnapshotCheckout)
753-
self.assertTrue(checkout._database is database)
753+
self.assertIs(checkout._database, database)
754754
self.assertIsNone(checkout._read_timestamp)
755755
self.assertIsNone(checkout._min_read_timestamp)
756756
self.assertEqual(checkout._max_staleness, staleness)
@@ -771,7 +771,7 @@ def test_snapshot_w_exact_staleness(self):
771771
checkout = database.snapshot(exact_staleness=staleness)
772772

773773
self.assertIsInstance(checkout, SnapshotCheckout)
774-
self.assertTrue(checkout._database is database)
774+
self.assertIs(checkout._database, database)
775775
self.assertIsNone(checkout._read_timestamp)
776776
self.assertIsNone(checkout._min_read_timestamp)
777777
self.assertIsNone(checkout._max_staleness)
@@ -788,7 +788,7 @@ def _getTargetClass(self):
788788
def test_ctor(self):
789789
database = _Database(self.DATABASE_NAME)
790790
checkout = self._make_one(database)
791-
self.assertTrue(checkout._database is database)
791+
self.assertIs(checkout._database, database)
792792

793793
def test_context_mgr_success(self):
794794
import datetime
@@ -865,7 +865,7 @@ def test_ctor_defaults(self):
865865
pool.put(session)
866866

867867
checkout = self._make_one(database)
868-
self.assertTrue(checkout._database is database)
868+
self.assertIs(checkout._database, database)
869869
self.assertIsNone(checkout._read_timestamp)
870870
self.assertIsNone(checkout._min_read_timestamp)
871871
self.assertIsNone(checkout._max_staleness)
@@ -891,7 +891,7 @@ def test_ctor_w_read_timestamp(self):
891891
pool.put(session)
892892

893893
checkout = self._make_one(database, read_timestamp=now)
894-
self.assertTrue(checkout._database is database)
894+
self.assertIs(checkout._database, database)
895895
self.assertEqual(checkout._read_timestamp, now)
896896
self.assertIsNone(checkout._min_read_timestamp)
897897
self.assertIsNone(checkout._max_staleness)
@@ -918,7 +918,7 @@ def test_ctor_w_min_read_timestamp(self):
918918
pool.put(session)
919919

920920
checkout = self._make_one(database, min_read_timestamp=now)
921-
self.assertTrue(checkout._database is database)
921+
self.assertIs(checkout._database, database)
922922
self.assertIsNone(checkout._read_timestamp)
923923
self.assertEqual(checkout._min_read_timestamp, now)
924924
self.assertIsNone(checkout._max_staleness)
@@ -944,7 +944,7 @@ def test_ctor_w_max_staleness(self):
944944
pool.put(session)
945945

946946
checkout = self._make_one(database, max_staleness=staleness)
947-
self.assertTrue(checkout._database is database)
947+
self.assertIs(checkout._database, database)
948948
self.assertIsNone(checkout._read_timestamp)
949949
self.assertIsNone(checkout._min_read_timestamp)
950950
self.assertEqual(checkout._max_staleness, staleness)

‎spanner/tests/unit/test_instance.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ def test_constructor_defaults(self):
5050
client = object()
5151
instance = self._make_one(self.INSTANCE_ID, client)
5252
self.assertEqual(instance.instance_id, self.INSTANCE_ID)
53-
self.assertTrue(instance._client is client)
54-
self.assertTrue(instance.configuration_name is None)
53+
self.assertIs(instance._client, client)
54+
self.assertIs(instance.configuration_name, None)
5555
self.assertEqual(instance.node_count, DEFAULT_NODE_COUNT)
5656
self.assertEqual(instance.display_name, self.INSTANCE_ID)
5757

@@ -64,7 +64,7 @@ def test_constructor_non_default(self):
6464
node_count=self.NODE_COUNT,
6565
display_name=DISPLAY_NAME)
6666
self.assertEqual(instance.instance_id, self.INSTANCE_ID)
67-
self.assertTrue(instance._client is client)
67+
self.assertIs(instance._client, client)
6868
self.assertEqual(instance.configuration_name, self.CONFIG_NAME)
6969
self.assertEqual(instance.node_count, self.NODE_COUNT)
7070
self.assertEqual(instance.display_name, DISPLAY_NAME)
@@ -78,10 +78,10 @@ def test_copy(self):
7878
new_instance = instance.copy()
7979

8080
# Make sure the client copy succeeded.
81-
self.assertFalse(new_instance._client is client)
81+
self.assertIsNot(new_instance._client, client)
8282
self.assertEqual(new_instance._client, client)
8383
# Make sure the client got copied to a new instance.
84-
self.assertFalse(instance is new_instance)
84+
self.assertIsNot(instance, new_instance)
8585
self.assertEqual(instance, new_instance)
8686

8787
def test__update_from_pb_success(self):
@@ -496,7 +496,7 @@ def test_database_factory_defaults(self):
496496

497497
self.assertTrue(isinstance(database, Database))
498498
self.assertEqual(database.database_id, DATABASE_ID)
499-
self.assertTrue(database._instance is instance)
499+
self.assertIs(database._instance, instance)
500500
self.assertEqual(list(database.ddl_statements), [])
501501
self.assertIsInstance(database._pool, BurstyPool)
502502
pool = database._pool
@@ -516,7 +516,7 @@ def test_database_factory_explicit(self):
516516

517517
self.assertTrue(isinstance(database, Database))
518518
self.assertEqual(database.database_id, DATABASE_ID)
519-
self.assertTrue(database._instance is instance)
519+
self.assertIs(database._instance, instance)
520520
self.assertEqual(list(database.ddl_statements), DDL_STATEMENTS)
521521
self.assertIs(database._pool, pool)
522522
self.assertIs(pool._bound, database)
@@ -547,7 +547,7 @@ def test_list_databases_wo_paging(self):
547547
instance_name, page_size, options = api._listed_databases
548548
self.assertEqual(instance_name, self.INSTANCE_NAME)
549549
self.assertEqual(page_size, None)
550-
self.assertTrue(options.page_token is INITIAL_PAGE)
550+
self.assertIs(options.page_token, INITIAL_PAGE)
551551
self.assertEqual(options.kwargs['metadata'],
552552
[('google-cloud-resource-prefix', instance.name)])
553553

‎spanner/tests/unit/test_session.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ def _make_one(self, *args, **kwargs):
3939
def test_constructor(self):
4040
database = _Database(self.DATABASE_NAME)
4141
session = self._make_one(database)
42-
self.assertTrue(session.session_id is None)
43-
self.assertTrue(session._database is database)
42+
self.assertIs(session.session_id, None)
43+
self.assertIs(session._database, database)
4444

4545
def test___lt___(self):
4646
database = _Database(self.DATABASE_NAME)
@@ -223,7 +223,7 @@ def test_snapshot_created(self):
223223
snapshot = session.snapshot()
224224

225225
self.assertIsInstance(snapshot, Snapshot)
226-
self.assertTrue(snapshot._session is session)
226+
self.assertIs(snapshot._session, session)
227227
self.assertTrue(snapshot._strong)
228228

229229
def test_read_not_created(self):
@@ -352,7 +352,7 @@ def test_batch_created(self):
352352
batch = session.batch()
353353

354354
self.assertIsInstance(batch, Batch)
355-
self.assertTrue(batch._session is session)
355+
self.assertIs(batch._session, session)
356356

357357
def test_transaction_not_created(self):
358358
database = _Database(self.DATABASE_NAME)
@@ -371,8 +371,8 @@ def test_transaction_created(self):
371371
transaction = session.transaction()
372372

373373
self.assertIsInstance(transaction, Transaction)
374-
self.assertTrue(transaction._session is session)
375-
self.assertTrue(session._transaction is transaction)
374+
self.assertIs(transaction._session, session)
375+
self.assertIs(session._transaction, transaction)
376376

377377
def test_transaction_w_existing_txn(self):
378378
database = _Database(self.DATABASE_NAME)
@@ -382,7 +382,7 @@ def test_transaction_w_existing_txn(self):
382382
existing = session.transaction()
383383
another = session.transaction() # invalidates existing txn
384384

385-
self.assertTrue(session._transaction is another)
385+
self.assertIs(session._transaction, another)
386386
self.assertTrue(existing._rolled_back)
387387

388388
def test_retry_transaction_w_commit_error_txn_already_begun(self):

0 commit comments

Comments
 (0)