openstack/heat
Code Issues Proposed changes

Enable a few hacking checks for test assertions

Browse Source 
Change-Id: I23a87e123e661b788e81df565aa83d611dae070a
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-29 14:02:50 +09:00
parent a1ce22a322
commit a6596603ee
9 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
heat/tests/clients/test_blazar_client.py
View File

@@ -30,7 +30,7 @@ class BlazarClientPluginTest(common.HeatTestCase):
def test_create(self):
client = self.blazar_client_plugin.client()
self.assertEqual(None, client.blazar_url)
self.assertIsNone(client.blazar_url)
def test_has_host_pass(self):
self._stub_client()

3
heat/tests/openstack/keystone/test_group.py
View File

@@ -220,8 +220,7 @@ class KeystoneGroupTest(common.HeatTestCase):
self.test_group.physical_resource_name.return_value = 'foo'
# validate the properties
self.assertEqual(
None,
self.assertIsNone(
self.test_group.properties.get(group.KeystoneGroup.NAME))
self.assertEqual(
'',

3
heat/tests/openstack/keystone/test_project.py
View File

@@ -271,8 +271,7 @@ class KeystoneProjectTest(common.HeatTestCase):
self.test_project.physical_resource_name.return_value = 'foo'
# validate the properties
self.assertEqual(
None,
self.assertIsNone(
self.test_project.properties.get(project.KeystoneProject.NAME))
self.assertEqual(
'',

9
heat/tests/openstack/magnum/test_cluster.py
View File

@@ -160,14 +160,12 @@ class TestMagnumCluster(common.HeatTestCase):
b = self._create_resource('cluster', self.min_rsrc_defn,
self.stack)
# validate the properties
self.assertEqual(
None,
self.assertIsNone(
b.properties.get(cluster.Cluster.NAME))
self.assertEqual(
self.fake_cluster_template,
b.properties.get(cluster.Cluster.CLUSTER_TEMPLATE))
self.assertEqual(
None,
self.assertIsNone(
b.properties.get(cluster.Cluster.KEYPAIR))
self.assertEqual(
1,
@@ -175,8 +173,7 @@ class TestMagnumCluster(common.HeatTestCase):
self.assertEqual(
1,
b.properties.get(cluster.Cluster.MASTER_COUNT))
self.assertEqual(
None,
self.assertIsNone(
b.properties.get(cluster.Cluster.DISCOVERY_URL))
self.assertEqual(
60,

10
heat/tests/test_function.py
View File

@@ -64,18 +64,18 @@ class TestFunctionResult(function.Function):
class FunctionTest(common.HeatTestCase):
def test_equal(self):
func = TestFunction(None, 'foo', ['bar', 'baz'])
self.assertTrue(func == 'wibble')
self.assertTrue('wibble' == func)
self.assertTrue(func == 'wibble') # noqa: H204
self.assertTrue('wibble' == func) # noqa: H204
def test_not_equal(self):
func = TestFunction(None, 'foo', ['bar', 'baz'])
self.assertTrue(func != 'foo')
self.assertTrue('foo' != func)
self.assertTrue(func != 'foo') # noqa: H204
self.assertTrue('foo' != func) # noqa: H204
def test_equal_func(self):
func1 = TestFunction(None, 'foo', ['bar', 'baz'])
func2 = TestFunction(None, 'blarg', ['wibble', 'quux'])
self.assertTrue(func1 == func2)
self.assertTrue(func1 == func2) # noqa: H204
def test_function_str_value(self):
func1 = TestFunction(None, 'foo', ['bar', 'baz'])

18
heat/tests/test_identifier.py
View File

@@ -335,28 +335,28 @@ class IdentifierTest(common.HeatTestCase):
def test_equal(self):
hi1 = identifier.HeatIdentifier('t', 's', 'i', 'p')
hi2 = identifier.HeatIdentifier('t', 's', 'i', 'p')
self.assertTrue(hi1 == hi2)
self.assertTrue(hi1 == hi2) # noqa: H204
def test_equal_dict(self):
hi = identifier.HeatIdentifier('t', 's', 'i', 'p')
self.assertTrue(hi == dict(hi))
self.assertTrue(dict(hi) == hi)
self.assertTrue(hi == dict(hi)) # noqa: H204
self.assertTrue(dict(hi) == hi) # noqa: H204
def test_not_equal(self):
hi1 = identifier.HeatIdentifier('t', 's', 'i', 'p')
hi2 = identifier.HeatIdentifier('t', 's', 'i', 'q')
self.assertFalse(hi1 == hi2)
self.assertFalse(hi2 == hi1)
self.assertFalse(hi1 == hi2) # noqa: H204
self.assertFalse(hi2 == hi1) # noqa: H204
def test_not_equal_dict(self):
hi1 = identifier.HeatIdentifier('t', 's', 'i', 'p')
hi2 = identifier.HeatIdentifier('t', 's', 'i', 'q')
self.assertFalse(hi1 == dict(hi2))
self.assertFalse(dict(hi1) == hi2)
self.assertFalse(hi1 == {'tenant': 't',
self.assertFalse(hi1 == dict(hi2)) # noqa: H204
self.assertFalse(dict(hi1) == hi2) # noqa: H204
self.assertFalse(hi1 == {'tenant': 't', # noqa: H204
'stack_name': 's',
'stack_id': 'i'})
self.assertFalse({'tenant': 't',
self.assertFalse({'tenant': 't', # noqa: H204
'stack_name': 's',
'stack_id': 'i'} == hi1)

16
heat/tests/test_properties.py
View File

@@ -1645,13 +1645,13 @@ class PropertiesTest(common.HeatTestCase):
schema = {'foo': {'Type': 'Integer'}}
props_a = properties.Properties(schema, {'foo': 1})
props_b = properties.Properties(schema, {'foo': 1})
self.assertFalse(props_a != props_b)
self.assertFalse(props_a != props_b) # noqa: H204
def test_compare_different(self):
schema = {'foo': {'Type': 'Integer'}}
props_a = properties.Properties(schema, {'foo': 0})
props_b = properties.Properties(schema, {'foo': 1})
self.assertTrue(props_a != props_b)
self.assertTrue(props_a != props_b) # noqa: H204
def test_description_substitution(self):
schema = {
@@ -1668,11 +1668,11 @@ class PropertiesTest(common.HeatTestCase):
blank_props = blank_rsrc.properties(schema)
self.assertEqual('Foo resource', blank_props['description'])
self.assertEqual(None, blank_props['not_description'])
self.assertIsNone(blank_props['not_description'])
replace_schema = {'description': properties.Schema('String')}
empty_props = blank_rsrc.properties(replace_schema)
self.assertEqual(None, empty_props['description'])
self.assertIsNone(empty_props['description'])
bar_props = bar_rsrc.properties(schema)
self.assertEqual('bar', bar_props['description'])
@@ -1690,10 +1690,10 @@ class PropertiesTest(common.HeatTestCase):
user_props = {'Foo': NullFunction(None, 'null', []), 'Baz': None}
props = properties.Properties(schema, user_props, function.resolve)
self.assertEqual(None, props['Foo'])
self.assertEqual(None, props.get_user_value('Foo'))
self.assertEqual(None, props['Bar'])
self.assertEqual(None, props.get_user_value('Bar'))
self.assertIsNone(props['Foo'])
self.assertIsNone(props.get_user_value('Foo'))
self.assertIsNone(props['Bar'])
self.assertIsNone(props.get_user_value('Bar'))
self.assertEqual('', props['Baz'])
self.assertEqual('', props.get_user_value('Baz'))

3
heat/tests/test_stack.py
View File

@@ -2713,8 +2713,7 @@ class StackTest(common.HeatTestCase):
tmpl_stack.status = tmpl_stack.IN_PROGRESS
tmpl_stack.current_traversal = 'some-traversal'
tmpl_stack.mark_complete()
self.assertEqual(tmpl_stack.prev_raw_template_id,
None)
self.assertIsNone(tmpl_stack.prev_raw_template_id)
self.assertFalse(mock_tmpl_delete.called)
self.assertFalse(mock_stack_delete.called)
self.assertEqual(tmpl_stack.status, tmpl_stack.COMPLETE)

1
tox.ini
View File

@@ -114,6 +114,7 @@ show-source = true
# W504 line break after binary operator
# TODO(tkajinam): Check why Nnnn checks from neutron-lib are enabled
ignore = E123,W503,W504,N
enable-extensions = H203,H204,H205,H211,H212
exclude=.*,dist,*lib/python*,*egg,build,*convergence/scenarios/*
max-complexity=23