Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

HYGIENE: Using assertIsInstance, assertIs, assertIsNone, assertIsNotNone when relevant #2364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dhermes merged 9 commits into from
Sep 20, 2016
Merged

HYGIENE: Using assertIsInstance, assertIs, assertIsNone, assertIsNotNone when relevant #2364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b990bfa
Replacing assertTrue(isinstance(...)) with assertIsInstance.
dhermes Sep 20, 2016
944e58d
Converting remaining usage of assertTrue(isinstance(...)).
dhermes Sep 20, 2016
66ea44d
Replacing assertTrue(... is None) with assertIsNone.
dhermes Sep 20, 2016
67d0385
Replacing assertTrue(... is ...) with assertIs(..., ...).
dhermes Sep 20, 2016
d07db3c
Replacing assertFalse(... is ...) with assertIsNot(..., ...).
dhermes Sep 20, 2016
24aa6e7
Replacing remaining assertTrue(... is ...) with assertIs(..., ...).
dhermes Sep 20, 2016
3f06350
Manually fixing some asserts broken by the auto scripts.
dhermes Sep 20, 2016
2c273f0
Replacing assertEqual(..., None) with assertIsNone(...).
dhermes Sep 20, 2016
206045f
Manually fixing some system test asserts broken by the auto scripts.
dhermes Sep 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions 14 system_tests/bigquery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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 = [
Expand All @@ -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)]
Expand All @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions 4 system_tests/bigtable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions 4 system_tests/datastore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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.assertIsNotNone(cursor)

# Fetch remaining of characters.
new_character_entities = list(iterator)
Expand Down
4 changes: 2 additions & 2 deletions 4 system_tests/pubsub.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('-')
Expand All @@ -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('-')
Expand Down
10 changes: 5 additions & 5 deletions 10 system_tests/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.assertIsNotNone(iterator.next_page_token)

response = iterator.get_next_page_response()
last_blobs = list(iterator.get_items_from_response(response))
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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/']))

Expand All @@ -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())


Expand Down
20 changes: 10 additions & 10 deletions 20 unit_tests/bigquery/test__helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,16 +339,16 @@ 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
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)
self.assertEqual(wrapper._configuration._attr, None)
self.assertIsNone(wrapper.attr)
self.assertIsNone(wrapper._configuration._attr)


class Test_TypedProperty(unittest.TestCase):
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand All @@ -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()
Expand Down
50 changes: 25 additions & 25 deletions 50 unit_tests/bigquery/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ def test_ctor(self):
creds = _Credentials()
http = object()
client = self._makeOne(project=PROJECT, credentials=creds, http=http)
self.assertTrue(isinstance(client.connection, Connection))
self.assertTrue(client.connection.credentials is creds)
self.assertTrue(client.connection.http is http)
self.assertIsInstance(client.connection, Connection)
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
Expand Down Expand Up @@ -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'])
Expand All @@ -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]
Expand Down Expand Up @@ -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)
Expand All @@ -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]
Expand All @@ -165,9 +165,9 @@ 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)
self.assertIs(dataset._client, client)

def test_job_from_resource_unknown_type(self):
PROJECT = 'PROJECT'
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand All @@ -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]
Expand All @@ -394,11 +394,11 @@ 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.assertTrue(job._client is client)
self.assertIsInstance(job, LoadTableFromStorageJob)
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
Expand All @@ -414,11 +414,11 @@ 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.assertTrue(job._client is client)
self.assertIsInstance(job, CopyJob)
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
Expand All @@ -433,8 +433,8 @@ 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.assertTrue(job._client is client)
self.assertIsInstance(job, ExtractTableToStorageJob)
self.assertIs(job._client, client)
self.assertEqual(job.name, JOB)
self.assertEqual(job.source, source)
self.assertEqual(list(job.destination_uris), [DESTINATION])
Expand All @@ -448,8 +448,8 @@ 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.assertTrue(job._client is client)
self.assertIsInstance(job, QueryJob)
self.assertIs(job._client, client)
self.assertEqual(job.name, JOB)
self.assertEqual(job.query, QUERY)

Expand All @@ -461,9 +461,9 @@ 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.assertTrue(job._client is client)
self.assertEqual(job.name, None)
self.assertIsInstance(job, QueryResults)
self.assertIs(job._client, client)
self.assertIsNone(job.name)
self.assertEqual(job.query, QUERY)


Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.