From f68b1307d1444074814e45fbb728f60352a61523 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Wed, 19 Jul 2017 09:45:06 -0700
Subject: [PATCH 1/2] Using assertIs in unit tests where appropriate.

Any usage of `self.assertTrue(a is b)` has become
`self.assertIs(a, b)`.
---
 spanner/tests/unit/test__helpers.py    |  2 +-
 spanner/tests/unit/test_batch.py       |  4 +--
 spanner/tests/unit/test_client.py      | 16 ++++++------
 spanner/tests/unit/test_database.py    | 36 +++++++++++++-------------
 spanner/tests/unit/test_instance.py    | 12 ++++-----
 spanner/tests/unit/test_session.py     | 14 +++++-----
 spanner/tests/unit/test_snapshot.py    | 12 ++++-----
 spanner/tests/unit/test_streamed.py    |  8 +++---
 spanner/tests/unit/test_transaction.py |  2 +-
 speech/tests/unit/test_client.py       |  4 +--
 10 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/spanner/tests/unit/test__helpers.py b/spanner/tests/unit/test__helpers.py
index 172c3343cba0..beb5ed7b6bac 100644
--- a/spanner/tests/unit/test__helpers.py
+++ b/spanner/tests/unit/test__helpers.py
@@ -512,7 +512,7 @@ def _make_one(self, session):
     def test_ctor(self):
         session = object()
         base = self._make_one(session)
-        self.assertTrue(base._session is session)
+        self.assertIs(base._session, session)
 
 
 class Test_options_with_prefix(unittest.TestCase):
diff --git a/spanner/tests/unit/test_batch.py b/spanner/tests/unit/test_batch.py
index ad4cbc872a1e..cf65fdd7e4f5 100644
--- a/spanner/tests/unit/test_batch.py
+++ b/spanner/tests/unit/test_batch.py
@@ -65,7 +65,7 @@ def _compare_values(self, result, source):
     def test_ctor(self):
         session = _Session()
         base = self._make_one(session)
-        self.assertTrue(base._session is session)
+        self.assertIs(base._session, session)
         self.assertEqual(len(base._mutations), 0)
 
     def test__check_state_virtual(self):
@@ -177,7 +177,7 @@ def _getTargetClass(self):
     def test_ctor(self):
         session = _Session()
         batch = self._make_one(session)
-        self.assertTrue(batch._session is session)
+        self.assertIs(batch._session, session)
 
     def test_commit_already_committed(self):
         from google.cloud.spanner.keyset import KeySet
diff --git a/spanner/tests/unit/test_client.py b/spanner/tests/unit/test_client.py
index 98e916d8927d..c71429c22535 100644
--- a/spanner/tests/unit/test_client.py
+++ b/spanner/tests/unit/test_client.py
@@ -60,7 +60,7 @@ def _constructor_test_helper(self, expected_scopes, creds,
         expected_creds = expected_creds or creds.with_scopes.return_value
         self.assertIs(client._credentials, expected_creds)
 
-        self.assertTrue(client._credentials is expected_creds)
+        self.assertIs(client._credentials, expected_creds)
         if expected_scopes is not None:
             creds.with_scopes.assert_called_once_with(expected_scopes)
 
@@ -162,7 +162,7 @@ def __init__(self, *args, **kwargs):
 
         self.assertTrue(isinstance(api, _Client))
         again = client.instance_admin_api
-        self.assertTrue(again is api)
+        self.assertIs(again, api)
         self.assertEqual(api.kwargs['lib_name'], 'gccl')
         self.assertIs(api.kwargs['credentials'], client.credentials)
 
@@ -183,7 +183,7 @@ def __init__(self, *args, **kwargs):
 
         self.assertTrue(isinstance(api, _Client))
         again = client.database_admin_api
-        self.assertTrue(again is api)
+        self.assertIs(again, api)
         self.assertEqual(api.kwargs['lib_name'], 'gccl')
         self.assertIs(api.kwargs['credentials'], client.credentials)
 
@@ -202,7 +202,7 @@ def test_copy(self):
     def test_credentials_property(self):
         credentials = _Credentials()
         client = self._make_one(project=self.PROJECT, credentials=credentials)
-        self.assertTrue(client.credentials is credentials)
+        self.assertIs(client.credentials, credentials)
 
     def test_project_name_property(self):
         credentials = _Credentials()
@@ -236,7 +236,7 @@ def test_list_instance_configs_wo_paging(self):
         project, page_size, options = api._listed_instance_configs
         self.assertEqual(project, self.PATH)
         self.assertEqual(page_size, None)
-        self.assertTrue(options.page_token is INITIAL_PAGE)
+        self.assertIs(options.page_token, INITIAL_PAGE)
         self.assertEqual(
             options.kwargs['metadata'],
             [('google-cloud-resource-prefix', client.project_name)])
@@ -292,7 +292,7 @@ def test_instance_factory_defaults(self):
         self.assertIsNone(instance.configuration_name)
         self.assertEqual(instance.display_name, self.INSTANCE_ID)
         self.assertEqual(instance.node_count, DEFAULT_NODE_COUNT)
-        self.assertTrue(instance._client is client)
+        self.assertIs(instance._client, client)
 
     def test_instance_factory_explicit(self):
         from google.cloud.spanner.instance import Instance
@@ -309,7 +309,7 @@ def test_instance_factory_explicit(self):
         self.assertEqual(instance.configuration_name, self.CONFIGURATION_NAME)
         self.assertEqual(instance.display_name, self.DISPLAY_NAME)
         self.assertEqual(instance.node_count, self.NODE_COUNT)
-        self.assertTrue(instance._client is client)
+        self.assertIs(instance._client, client)
 
     def test_list_instances_wo_paging(self):
         from google.cloud._testing import _GAXPageIterator
@@ -342,7 +342,7 @@ def test_list_instances_wo_paging(self):
         self.assertEqual(project, self.PATH)
         self.assertEqual(filter_, 'name:TEST')
         self.assertEqual(page_size, None)
-        self.assertTrue(options.page_token is INITIAL_PAGE)
+        self.assertIs(options.page_token, INITIAL_PAGE)
         self.assertEqual(
             options.kwargs['metadata'],
             [('google-cloud-resource-prefix', client.project_name)])
diff --git a/spanner/tests/unit/test_database.py b/spanner/tests/unit/test_database.py
index 5369a6f2c0d1..5200a0ab7d1b 100644
--- a/spanner/tests/unit/test_database.py
+++ b/spanner/tests/unit/test_database.py
@@ -50,7 +50,7 @@ def test_ctor_defaults(self):
         database = self._make_one(self.DATABASE_ID, instance)
 
         self.assertEqual(database.database_id, self.DATABASE_ID)
-        self.assertTrue(database._instance is instance)
+        self.assertIs(database._instance, instance)
         self.assertEqual(list(database.ddl_statements), [])
         self.assertIsInstance(database._pool, BurstyPool)
         # BurstyPool does not create sessions during 'bind()'.
@@ -61,7 +61,7 @@ def test_ctor_w_explicit_pool(self):
         pool = _Pool()
         database = self._make_one(self.DATABASE_ID, instance, pool=pool)
         self.assertEqual(database.database_id, self.DATABASE_ID)
-        self.assertTrue(database._instance is instance)
+        self.assertIs(database._instance, instance)
         self.assertEqual(list(database.ddl_statements), [])
         self.assertIs(database._pool, pool)
         self.assertIs(pool._bound, database)
@@ -89,7 +89,7 @@ def test_ctor_w_ddl_statements_ok(self):
             self.DATABASE_ID, instance, ddl_statements=DDL_STATEMENTS,
             pool=pool)
         self.assertEqual(database.database_id, self.DATABASE_ID)
-        self.assertTrue(database._instance is instance)
+        self.assertIs(database._instance, instance)
         self.assertEqual(list(database.ddl_statements), DDL_STATEMENTS)
 
     def test_from_pb_bad_database_name(self):
@@ -196,10 +196,10 @@ def _mock_spanner_client(*args, **kwargs):
 
         with _Monkey(MUT, SpannerClient=_mock_spanner_client):
             api = database.spanner_api
-            self.assertTrue(api is _client)
+            self.assertIs(api,  _client)
             # API instance is cached
             again = database.spanner_api
-            self.assertTrue(again is api)
+            self.assertIs(again, api)
 
     def test___eq__(self):
         instance = _Instance(self.INSTANCE_NAME)
@@ -567,8 +567,8 @@ def test_session_factory(self):
         session = database.session()
 
         self.assertTrue(isinstance(session, Session))
-        self.assertTrue(session.session_id is None)
-        self.assertTrue(session._database is database)
+        self.assertIs(session.session_id, None)
+        self.assertIs(session._database, database)
 
     def test_execute_sql_defaults(self):
         QUERY = 'SELECT * FROM employees'
@@ -671,7 +671,7 @@ def test_batch(self):
 
         checkout = database.batch()
         self.assertIsInstance(checkout, BatchCheckout)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
 
     def test_snapshot_defaults(self):
         from google.cloud.spanner.database import SnapshotCheckout
@@ -685,7 +685,7 @@ def test_snapshot_defaults(self):
 
         checkout = database.snapshot()
         self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertIsNone(checkout._max_staleness)
@@ -707,7 +707,7 @@ def test_snapshot_w_read_timestamp(self):
         checkout = database.snapshot(read_timestamp=now)
 
         self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertEqual(checkout._read_timestamp, now)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertIsNone(checkout._max_staleness)
@@ -729,7 +729,7 @@ def test_snapshot_w_min_read_timestamp(self):
         checkout = database.snapshot(min_read_timestamp=now)
 
         self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertEqual(checkout._min_read_timestamp, now)
         self.assertIsNone(checkout._max_staleness)
@@ -750,7 +750,7 @@ def test_snapshot_w_max_staleness(self):
         checkout = database.snapshot(max_staleness=staleness)
 
         self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertEqual(checkout._max_staleness, staleness)
@@ -771,7 +771,7 @@ def test_snapshot_w_exact_staleness(self):
         checkout = database.snapshot(exact_staleness=staleness)
 
         self.assertIsInstance(checkout, SnapshotCheckout)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertIsNone(checkout._max_staleness)
@@ -788,7 +788,7 @@ def _getTargetClass(self):
     def test_ctor(self):
         database = _Database(self.DATABASE_NAME)
         checkout = self._make_one(database)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
 
     def test_context_mgr_success(self):
         import datetime
@@ -865,7 +865,7 @@ def test_ctor_defaults(self):
         pool.put(session)
 
         checkout = self._make_one(database)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertIsNone(checkout._max_staleness)
@@ -891,7 +891,7 @@ def test_ctor_w_read_timestamp(self):
         pool.put(session)
 
         checkout = self._make_one(database, read_timestamp=now)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertEqual(checkout._read_timestamp, now)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertIsNone(checkout._max_staleness)
@@ -918,7 +918,7 @@ def test_ctor_w_min_read_timestamp(self):
         pool.put(session)
 
         checkout = self._make_one(database, min_read_timestamp=now)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertEqual(checkout._min_read_timestamp, now)
         self.assertIsNone(checkout._max_staleness)
@@ -944,7 +944,7 @@ def test_ctor_w_max_staleness(self):
         pool.put(session)
 
         checkout = self._make_one(database, max_staleness=staleness)
-        self.assertTrue(checkout._database is database)
+        self.assertIs(checkout._database, database)
         self.assertIsNone(checkout._read_timestamp)
         self.assertIsNone(checkout._min_read_timestamp)
         self.assertEqual(checkout._max_staleness, staleness)
diff --git a/spanner/tests/unit/test_instance.py b/spanner/tests/unit/test_instance.py
index b556a0396f01..95c4696be225 100644
--- a/spanner/tests/unit/test_instance.py
+++ b/spanner/tests/unit/test_instance.py
@@ -50,8 +50,8 @@ def test_constructor_defaults(self):
         client = object()
         instance = self._make_one(self.INSTANCE_ID, client)
         self.assertEqual(instance.instance_id, self.INSTANCE_ID)
-        self.assertTrue(instance._client is client)
-        self.assertTrue(instance.configuration_name is None)
+        self.assertIs(instance._client, client)
+        self.assertIs(instance.configuration_name, None)
         self.assertEqual(instance.node_count, DEFAULT_NODE_COUNT)
         self.assertEqual(instance.display_name, self.INSTANCE_ID)
 
@@ -64,7 +64,7 @@ def test_constructor_non_default(self):
                                   node_count=self.NODE_COUNT,
                                   display_name=DISPLAY_NAME)
         self.assertEqual(instance.instance_id, self.INSTANCE_ID)
-        self.assertTrue(instance._client is client)
+        self.assertIs(instance._client, client)
         self.assertEqual(instance.configuration_name, self.CONFIG_NAME)
         self.assertEqual(instance.node_count, self.NODE_COUNT)
         self.assertEqual(instance.display_name, DISPLAY_NAME)
@@ -496,7 +496,7 @@ def test_database_factory_defaults(self):
 
         self.assertTrue(isinstance(database, Database))
         self.assertEqual(database.database_id, DATABASE_ID)
-        self.assertTrue(database._instance is instance)
+        self.assertIs(database._instance, instance)
         self.assertEqual(list(database.ddl_statements), [])
         self.assertIsInstance(database._pool, BurstyPool)
         pool = database._pool
@@ -516,7 +516,7 @@ def test_database_factory_explicit(self):
 
         self.assertTrue(isinstance(database, Database))
         self.assertEqual(database.database_id, DATABASE_ID)
-        self.assertTrue(database._instance is instance)
+        self.assertIs(database._instance, instance)
         self.assertEqual(list(database.ddl_statements), DDL_STATEMENTS)
         self.assertIs(database._pool, pool)
         self.assertIs(pool._bound, database)
@@ -547,7 +547,7 @@ def test_list_databases_wo_paging(self):
         instance_name, page_size, options = api._listed_databases
         self.assertEqual(instance_name, self.INSTANCE_NAME)
         self.assertEqual(page_size, None)
-        self.assertTrue(options.page_token is INITIAL_PAGE)
+        self.assertIs(options.page_token, INITIAL_PAGE)
         self.assertEqual(options.kwargs['metadata'],
                          [('google-cloud-resource-prefix', instance.name)])
 
diff --git a/spanner/tests/unit/test_session.py b/spanner/tests/unit/test_session.py
index 5f75d471a7cf..ce9f81eccc7a 100644
--- a/spanner/tests/unit/test_session.py
+++ b/spanner/tests/unit/test_session.py
@@ -39,8 +39,8 @@ def _make_one(self, *args, **kwargs):
     def test_constructor(self):
         database = _Database(self.DATABASE_NAME)
         session = self._make_one(database)
-        self.assertTrue(session.session_id is None)
-        self.assertTrue(session._database is database)
+        self.assertIs(session.session_id, None)
+        self.assertIs(session._database, database)
 
     def test___lt___(self):
         database = _Database(self.DATABASE_NAME)
@@ -223,7 +223,7 @@ def test_snapshot_created(self):
         snapshot = session.snapshot()
 
         self.assertIsInstance(snapshot, Snapshot)
-        self.assertTrue(snapshot._session is session)
+        self.assertIs(snapshot._session, session)
         self.assertTrue(snapshot._strong)
 
     def test_read_not_created(self):
@@ -352,7 +352,7 @@ def test_batch_created(self):
         batch = session.batch()
 
         self.assertIsInstance(batch, Batch)
-        self.assertTrue(batch._session is session)
+        self.assertIs(batch._session, session)
 
     def test_transaction_not_created(self):
         database = _Database(self.DATABASE_NAME)
@@ -371,8 +371,8 @@ def test_transaction_created(self):
         transaction = session.transaction()
 
         self.assertIsInstance(transaction, Transaction)
-        self.assertTrue(transaction._session is session)
-        self.assertTrue(session._transaction is transaction)
+        self.assertIs(transaction._session, session)
+        self.assertIs(session._transaction, transaction)
 
     def test_transaction_w_existing_txn(self):
         database = _Database(self.DATABASE_NAME)
@@ -382,7 +382,7 @@ def test_transaction_w_existing_txn(self):
         existing = session.transaction()
         another = session.transaction()  # invalidates existing txn
 
-        self.assertTrue(session._transaction is another)
+        self.assertIs(session._transaction, another)
         self.assertTrue(existing._rolled_back)
 
     def test_retry_transaction_w_commit_error_txn_already_begun(self):
diff --git a/spanner/tests/unit/test_snapshot.py b/spanner/tests/unit/test_snapshot.py
index cf1abce94f45..c5213dbd6cda 100644
--- a/spanner/tests/unit/test_snapshot.py
+++ b/spanner/tests/unit/test_snapshot.py
@@ -66,7 +66,7 @@ def _make_txn_selector(self):
     def test_ctor(self):
         session = _Session()
         base = self._make_one(session)
-        self.assertTrue(base._session is session)
+        self.assertIs(base._session, session)
 
     def test__make_txn_selector_virtual(self):
         session = _Session()
@@ -320,7 +320,7 @@ def _makeDuration(self, seconds=1, microseconds=0):
     def test_ctor_defaults(self):
         session = _Session()
         snapshot = self._make_one(session)
-        self.assertTrue(snapshot._session is session)
+        self.assertIs(snapshot._session, session)
         self.assertTrue(snapshot._strong)
         self.assertIsNone(snapshot._read_timestamp)
         self.assertIsNone(snapshot._min_read_timestamp)
@@ -340,7 +340,7 @@ def test_ctor_w_read_timestamp(self):
         timestamp = self._makeTimestamp()
         session = _Session()
         snapshot = self._make_one(session, read_timestamp=timestamp)
-        self.assertTrue(snapshot._session is session)
+        self.assertIs(snapshot._session, session)
         self.assertFalse(snapshot._strong)
         self.assertEqual(snapshot._read_timestamp, timestamp)
         self.assertIsNone(snapshot._min_read_timestamp)
@@ -351,7 +351,7 @@ def test_ctor_w_min_read_timestamp(self):
         timestamp = self._makeTimestamp()
         session = _Session()
         snapshot = self._make_one(session, min_read_timestamp=timestamp)
-        self.assertTrue(snapshot._session is session)
+        self.assertIs(snapshot._session, session)
         self.assertFalse(snapshot._strong)
         self.assertIsNone(snapshot._read_timestamp)
         self.assertEqual(snapshot._min_read_timestamp, timestamp)
@@ -362,7 +362,7 @@ def test_ctor_w_max_staleness(self):
         duration = self._makeDuration()
         session = _Session()
         snapshot = self._make_one(session, max_staleness=duration)
-        self.assertTrue(snapshot._session is session)
+        self.assertIs(snapshot._session, session)
         self.assertFalse(snapshot._strong)
         self.assertIsNone(snapshot._read_timestamp)
         self.assertIsNone(snapshot._min_read_timestamp)
@@ -373,7 +373,7 @@ def test_ctor_w_exact_staleness(self):
         duration = self._makeDuration()
         session = _Session()
         snapshot = self._make_one(session, exact_staleness=duration)
-        self.assertTrue(snapshot._session is session)
+        self.assertIs(snapshot._session, session)
         self.assertFalse(snapshot._strong)
         self.assertIsNone(snapshot._read_timestamp)
         self.assertIsNone(snapshot._min_read_timestamp)
diff --git a/spanner/tests/unit/test_streamed.py b/spanner/tests/unit/test_streamed.py
index 3300e4048cc7..edcace273f66 100644
--- a/spanner/tests/unit/test_streamed.py
+++ b/spanner/tests/unit/test_streamed.py
@@ -561,7 +561,7 @@ def test_consume_next_first_set_partial(self):
         streamed.consume_next()
         self.assertEqual(streamed.rows, [])
         self.assertEqual(streamed._current_row, BARE)
-        self.assertTrue(streamed.metadata is metadata)
+        self.assertIs(streamed.metadata, metadata)
         self.assertEqual(streamed.resume_token, result_set.resume_token)
 
     def test_consume_next_w_partial_result(self):
@@ -630,7 +630,7 @@ def test_consume_next_last_set(self):
         streamed.consume_next()
         self.assertEqual(streamed.rows, [BARE])
         self.assertEqual(streamed._current_row, [])
-        self.assertTrue(streamed._stats is stats)
+        self.assertIs(streamed._stats, stats)
         self.assertEqual(streamed.resume_token, result_set.resume_token)
 
     def test_consume_all_empty(self):
@@ -653,7 +653,7 @@ def test_consume_all_one_result_set_partial(self):
         streamed.consume_all()
         self.assertEqual(streamed.rows, [])
         self.assertEqual(streamed._current_row, BARE)
-        self.assertTrue(streamed.metadata is metadata)
+        self.assertIs(streamed.metadata, metadata)
 
     def test_consume_all_multiple_result_sets_filled(self):
         FIELDS = [
@@ -703,7 +703,7 @@ def test___iter___one_result_set_partial(self):
         self.assertEqual(found, [])
         self.assertEqual(streamed.rows, [])
         self.assertEqual(streamed._current_row, BARE)
-        self.assertTrue(streamed.metadata is metadata)
+        self.assertIs(streamed.metadata, metadata)
 
     def test___iter___multiple_result_sets_filled(self):
         FIELDS = [
diff --git a/spanner/tests/unit/test_transaction.py b/spanner/tests/unit/test_transaction.py
index bdb8d20b8f01..997f4d5153c8 100644
--- a/spanner/tests/unit/test_transaction.py
+++ b/spanner/tests/unit/test_transaction.py
@@ -48,7 +48,7 @@ def _make_one(self, *args, **kwargs):
     def test_ctor_defaults(self):
         session = _Session()
         transaction = self._make_one(session)
-        self.assertTrue(transaction._session is session)
+        self.assertIs(transaction._session, session)
         self.assertIsNone(transaction._id)
         self.assertIsNone(transaction.committed)
         self.assertEqual(transaction._rolled_back, False)
diff --git a/speech/tests/unit/test_client.py b/speech/tests/unit/test_client.py
index 259df66b0a3d..b66d3080e066 100644
--- a/speech/tests/unit/test_client.py
+++ b/speech/tests/unit/test_client.py
@@ -88,8 +88,8 @@ def test_ctor(self):
         creds = _make_credentials()
         http = object()
         client = self._make_one(credentials=creds, _http=http)
-        self.assertTrue(client._credentials is creds)
-        self.assertTrue(client._http is http)
+        self.assertIs(client._credentials, creds)
+        self.assertIs(client._http, http)
 
     def test_ctor_use_grpc_preset(self):
         creds = _make_credentials()

From ca68f12ad468dc8f779062f29931a4b830b58d0c Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Wed, 19 Jul 2017 09:50:26 -0700
Subject: [PATCH 2/2] Converting some assertFalse(a is b) to assertIsNot(a, b).

---
 spanner/tests/unit/test_instance.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spanner/tests/unit/test_instance.py b/spanner/tests/unit/test_instance.py
index 95c4696be225..d86c611b3ccb 100644
--- a/spanner/tests/unit/test_instance.py
+++ b/spanner/tests/unit/test_instance.py
@@ -78,10 +78,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__update_from_pb_success(self):