openstack
/
horizon
Code Issues Proposed changes

Replace assertEqual(None, *) with assertIsNone in tests 

Replace assertEqual(None, *) with assertIsNone in tests to have
more clear messages in case of failure.

Change-Id: I2506fe57adb98c52147138d8eb6c0254423ffdd7
This commit is contained in:
lawrancejing 2014-02-16 13:28:18 +08:00 committed by zhang-jinnan
parent b4972c09b8
commit f85ed2e595
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
horizon/test/tests/tables.py
View File

@ -314,8 +314,8 @@ class DataTableTests(test.TestCase):
self.table = TempTable(self.request, TEST_DATA_2)
name_column = self.table.columns['name']
self.assertEqual(name_column.update_action, None)
self.assertEqual(name_column.form_field, None)
self.assertIsNone(name_column.update_action)
self.assertIsNone(name_column.form_field)
self.assertEqual(name_column.form_field_attributes, {})
def test_table_natural_no_actions_column(self):
@ -430,7 +430,7 @@ class DataTableTests(test.TestCase):
self.assertEqual(row.cells['id'].get_status_class(cell_status),
'status_down')
cell_status = row3.cells['id'].status
self.assertEqual(cell_status, None)
self.assertIsNone(cell_status)
self.assertEqual(row.cells['id'].get_status_class(cell_status),
'status_unknown')
@ -741,7 +741,7 @@ class DataTableTests(test.TestCase):
self.assertEqual(self.table.parse_action(action_string),
('my_table', 'delete', None))
handled = self.table.maybe_handle()
self.assertEqual(handled, None)
self.assertIsNone(handled)
self.assertEqual(list(req._messages)[0].message,
"Please select a row before taking that action.")
@ -779,7 +779,7 @@ class DataTableTests(test.TestCase):
req = self.factory.post('/my_url/', {action_string: '2'})
self.table = MyTable(req, TEST_DATA)
handled = self.table.maybe_handle()
self.assertEqual(handled, None)
self.assertIsNone(handled)
self.assertQuerysetEqual(self.table.filtered_data,
['<FakeObject: object_2>'])
@ -787,7 +787,7 @@ class DataTableTests(test.TestCase):
req = self.factory.get('/my_url/', {action_string: '2'})
self.table = MyTable(req, TEST_DATA)
handled = self.table.maybe_handle()
self.assertEqual(handled, None)
self.assertIsNone(handled)
self.assertQuerysetEqual(self.table.filtered_data,
['<FakeObject: object_1>',
'<FakeObject: object_2>',
@ -811,9 +811,9 @@ class DataTableTests(test.TestCase):
req = self.factory.get('/my_url/', params)
self.table = MyTable(req)
resp = self.table.maybe_preempt()
self.assertEqual(resp, None)
self.assertIsNone(resp)
resp = self.table.maybe_handle()
self.assertEqual(resp, None)
self.assertIsNone(resp)
# Verbose names
table_actions = self.table.get_table_actions()
@ -832,7 +832,7 @@ class DataTableTests(test.TestCase):
self.table = MyTable(req, TEST_DATA_2)
handled = self.table.maybe_preempt()
# Checking the response header.
self.assertEqual(handled, None)
self.assertIsNone(handled)
def test_inline_edit_update_action_get(self):
# Get request should return td field with data.

8
horizon/test/tests/tabs.py
View File

@ -122,10 +122,10 @@ class TabTests(test.TestCase):
self.assertEqual(tg.get_tab("tab_one").slug, "tab_one")
# Test selected is None w/o GET input
self.assertEqual(tg.selected, None)
self.assertIsNone(tg.selected)
# Test get_selected_tab is None w/o GET input
self.assertEqual(tg.get_selected_tab(), None)
self.assertIsNone(tg.get_selected_tab())
def test_tab_group_active_tab(self):
tg = Group(self.request)
@ -161,7 +161,7 @@ class TabTests(test.TestCase):
# Disallowed tab isn't even returned
tab_disallowed = tg.get_tab("tab_disallowed")
self.assertEqual(tab_disallowed, None)
self.assertIsNone(tab_disallowed)
# get_id
self.assertEqual(tab_one.get_id(), "tab_group__tab_one")
@ -242,7 +242,7 @@ class TabTests(test.TestCase):
table = tab._tables[MyTable.Meta.name]
self.assertIsInstance(table, MyTable)
# Let's make sure the data *really* isn't loaded yet.
self.assertEqual(table.data, None)
self.assertIsNone(table.data)
# Okay, load the data.
tab.load_table_data()
self.assertTrue(tab._table_data_loaded)

2
openstack_dashboard/dashboards/project/stacks/tests.py
View File

@ -228,4 +228,4 @@ malformed or otherwise incorrect.
}"""
msg = forms.exception_to_validation_msg(json_error)
self.assertEqual(msg, None)
self.assertIsNone(msg)

4
openstack_dashboard/test/api_tests/network_tests.py
View File

@ -453,7 +453,7 @@ class NetworkApiNeutronFloatingIpTests(NetworkApiNeutronTestBase):
ret = api.network.tenant_floating_ip_get(self.request, fip['id'])
for attr in ['id', 'ip', 'pool', 'fixed_ip', 'port_id']:
self.assertEqual(ret.__getattr__(attr), fip[attr])
self.assertEqual(ret.instance_id, None)
self.assertIsNone(ret.instance_id)
def test_floating_ip_allocate(self):
ext_nets = [n for n in self.api_networks.list()
@ -469,7 +469,7 @@ class NetworkApiNeutronFloatingIpTests(NetworkApiNeutronTestBase):
ext_net['id'])
for attr in ['id', 'ip', 'pool', 'fixed_ip', 'port_id']:
self.assertEqual(ret.__getattr__(attr), fip[attr])
self.assertEqual(ret.instance_id, None)
self.assertIsNone(ret.instance_id)
def test_floating_ip_release(self):
fip = self.api_q_floating_ips.first()

2
openstack_dashboard/test/tests/policy.py
View File

@ -30,7 +30,7 @@ class PolicyTestCase(test.TestCase):
policy._get_enforcer()
self.assertEqual(len(policy._ENFORCER), 2)
policy.reset()
self.assertEqual(policy._ENFORCER, None)
self.assertIsNone(policy._ENFORCER)
def test_check_admin_required_false(self):
policy.reset()