x/daisycloud-core
Code Issues Proposed changes

Using assertFalse(A) instead of assertEqual(False, A)

Browse Source 
This patch is to replace assertEqual(False, A) with assertFalse(A), which
the latter is more straightforward and easier to understand. Also the
relevant hacking rule is added.

Change-Id: I79e81ea3f01d17746ec6a666307d864a2216b71b
This commit is contained in:
loooosy 2017-06-14 09:18:56 +08:00
parent cef1f7e732
commit 920ee7f6d4
5 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/daisy/daisy/tests/common/test_utils.py
View File

@ -83,4 +83,4 @@ class TestUtils(test.TestCase):
def test_is_cidrs_overlapped_false(self):
cidrs = ['12.1.1.1/24', '13.1.1.1/24', '14.1.1.1/23']
self.assertEqual(False, utils.is_cidrs_overlapped(cidrs))
self.assertFalse(utils.is_cidrs_overlapped(cidrs))

4
code/daisyclient/tests/v1/test_image_members.py
View File

@ -67,7 +67,7 @@ class ImageMemberManagerTest(testtools.TestCase):
self.assertEqual(1, len(members))
self.assertEqual('1', members[0].member_id)
self.assertEqual('1', members[0].image_id)
self.assertEqual(False, members[0].can_share)
self.assertFalse(members[0].can_share)
def test_list_by_member(self):
resource_class = glanceclient.v1.image_members.ImageMember
@ -82,7 +82,7 @@ class ImageMemberManagerTest(testtools.TestCase):
self.assertEqual(expect, self.api.calls)
self.assertEqual('1', member.member_id)
self.assertEqual('1', member.image_id)
self.assertEqual(False, member.can_share)
self.assertFalse(member.can_share)
def test_delete(self):
self.mgr.delete('1', '1')

18
code/daisyclient/tests/v1/test_images.py
View File

@ -502,9 +502,9 @@ class ImageManagerTest(testtools.TestCase):
self.assertEqual(expect, self.api.calls)
self.assertEqual('1', image.id)
self.assertEqual('image-1', image.name)
self.assertEqual(False, image.is_public)
self.assertEqual(False, image.protected)
self.assertEqual(False, image.deleted)
self.assertFalse(image.is_public)
self.assertFalse(image.protected)
self.assertFalse(image.deleted)
self.assertEqual({u'arch': u'x86_64'}, image.properties)
def test_get_int(self):
@ -513,9 +513,9 @@ class ImageManagerTest(testtools.TestCase):
self.assertEqual(expect, self.api.calls)
self.assertEqual('1', image.id)
self.assertEqual('image-1', image.name)
self.assertEqual(False, image.is_public)
self.assertEqual(False, image.protected)
self.assertEqual(False, image.deleted)
self.assertFalse(image.is_public)
self.assertFalse(image.protected)
self.assertFalse(image.deleted)
self.assertEqual({u'arch': u'x86_64'}, image.properties)
def test_get_encoding(self):
@ -628,9 +628,9 @@ class ImageManagerTest(testtools.TestCase):
self.assertEqual(1024, image.size)
self.assertEqual(512, image.min_ram)
self.assertEqual(10, image.min_disk)
self.assertEqual(False, image.is_public)
self.assertEqual(False, image.protected)
self.assertEqual(False, image.deleted)
self.assertFalse(image.is_public)
self.assertFalse(image.protected)
self.assertFalse(image.deleted)
self.assertEqual({'a': 'b', 'c': 'd'}, image.properties)
def test_create_with_data(self):

16
code/horizon/horizon/test/tests/tables.py
View File

@ -500,14 +500,14 @@ class DataTableTests(test.TestCase):
self.assertEqual("Id", unicode(id_col))
self.assertEqual("Verbose Name", unicode(name_col))
# sortable
self.assertEqual(False, id_col.sortable)
self.assertFalse(id_col.sortable)
self.assertNotIn("sortable", id_col.get_final_attrs().get('class', ""))
self.assertEqual(True, name_col.sortable)
self.assertIn("sortable", name_col.get_final_attrs().get('class', ""))
# hidden
self.assertEqual(True, id_col.hidden)
self.assertIn("hide", id_col.get_final_attrs().get('class', ""))
self.assertEqual(False, name_col.hidden)
self.assertFalse(name_col.hidden)
self.assertNotIn("hide", name_col.get_final_attrs().get('class', ""))
# link, link_classes, link_attrs, and get_link_url
self.assertIn('href="http://example.com/"', row.cells['value'].value)
@ -529,7 +529,7 @@ class DataTableTests(test.TestCase):
id_col.status = True
id_col.status_choices = (('1', False), ('2', True), ('3', None))
cell_status = row.cells['id'].status
self.assertEqual(False, cell_status)
self.assertFalse(cell_status)
self.assertEqual('status_down',
row.cells['id'].get_status_class(cell_status))
cell_status = row3.cells['id'].status
@ -656,8 +656,7 @@ class DataTableTests(test.TestCase):
# but is not in inline_edit_mod.
self.assertEqual(True,
name_cell.inline_edit_available)
self.assertEqual(False,
name_cell.inline_edit_mod)
self.assertFalse(name_cell.inline_edit_mod)
# Check if is cell is rendered correctly.
name_cell_rendered = name_cell.render()
@ -684,8 +683,7 @@ class DataTableTests(test.TestCase):
# but is not in inline_edit_mod.
self.assertEqual(True,
name_cell.inline_edit_available)
self.assertEqual(False,
name_cell.inline_edit_mod)
self.assertFalse(name_cell.inline_edit_mod)
# Check if is cell is rendered correctly.
name_cell_rendered = name_cell.render()
@ -1230,7 +1228,7 @@ class DataTableTests(test.TestCase):
# hidden
self.assertEqual(True, id_col.hidden)
self.assertIn("hide", id_col.get_final_attrs().get('class', ""))
self.assertEqual(False, name_col.hidden)
self.assertFalse(name_col.hidden)
self.assertNotIn("hide", name_col.get_final_attrs().get('class', ""))
# link, link_classes, link_attrs and get_link_url
self.assertIn('href="http://example.com/"', row.cells['value'].value)
@ -1283,7 +1281,7 @@ class DataTableTests(test.TestCase):
id_col.status = True
id_col.status_choices = (('1', False), ('2', True))
cell_status = row.cells['id'].status
self.assertEqual(False, cell_status)
self.assertFalse(cell_status)
self.assertEqual('status_down',
row.cells['id'].get_status_class(cell_status))
# Ensure data is not cached on the column across table instances

2
code/horizon/horizon/test/tests/workflows.py
View File

@ -204,7 +204,7 @@ class WorkflowsTests(test.TestCase):
# This should set the value without any errors, but trigger nothing
flow.context['does_not_exist'] = False
self.assertEqual(False, flow.context['does_not_exist'])
self.assertFalse(flow.context['does_not_exist'])
# The order here is relevant. Note that we inserted "extra" between
# steps one and two, and one has no handlers, so we should see