openstack
/
heat
Code Issues Proposed changes

Use assertIn and assertNotIn 

Tests should use:
  self.assertIn(value, list)
  self.assertNotIn(value, list)

instead of:
  self.assertTrue(value in list)
  self.assertFalse(value in list)

because assertIn and assertNotIn raise more meaningful errors:
  self.assertIn(3, [1, 2]
  >>> MismatchError: 3 not in [1, 2]

  self.assertTrue(3 in [1, 2])
  >>> AssertionError: False is not true

Change-Id: I4b24b6e00bf26c0a68a9d8f9eb9185c435791dfc
Closes-Bug: #1510007
This commit is contained in:
Bertrand Lallau 2015-10-26 16:43:42 +01:00 committed by Bertrand Lallau
parent 55f30cc976
commit 1216d357f0
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
heat/tests/engine/test_dependencies.py
View File

@ -25,7 +25,7 @@ class dependenciesTest(common.HeatTestCase):
order = list(func(d))
for n in nodes:
self.assertTrue(n in order, '"%s" is not in the sequence' % n)
self.assertIn(n, order, '"%s" is not in the sequence' % n)
self.assertEqual(1, order.count(n))
self.assertEqual(len(nodes), len(order))
@ -181,8 +181,8 @@ class dependenciesTest(common.HeatTestCase):
order = list(iter(p))
self.assertEqual(2, len(order))
for n in ('last', 'middle'):
self.assertTrue(n in order,
"'%s' not found in dependency order" % n)
self.assertIn(n, order,
"'%s' not found in dependency order" % n)
self.assertTrue(order.index('last') > order.index('middle'))
def test_simple_multilevel_partial(self):
@ -193,8 +193,8 @@ class dependenciesTest(common.HeatTestCase):
order = list(iter(p))
self.assertEqual(3, len(order))
for n in ('last', 'middle', 'target'):
self.assertTrue(n in order,
"'%s' not found in dependency order" % n)
self.assertIn(n, order,
"'%s' not found in dependency order" % n)
def test_complex_partial(self):
d = dependencies.Dependencies([('last', 'e1'), ('last', 'mid1'),
@ -205,8 +205,8 @@ class dependenciesTest(common.HeatTestCase):
order = list(iter(p))
self.assertEqual(4, len(order))
for n in ('last', 'mid1', 'mid2', 'mid3'):
self.assertTrue(n in order,
"'%s' not found in dependency order" % n)
self.assertIn(n, order,
"'%s' not found in dependency order" % n)
def test_required_by(self):
d = dependencies.Dependencies([('last', 'e1'), ('last', 'mid1'),
@ -219,13 +219,13 @@ class dependenciesTest(common.HeatTestCase):
required_by = list(d.required_by('mid3'))
self.assertEqual(2, len(required_by))
for n in ('mid1', 'mid2'):
self.assertTrue(n in required_by,
"'%s' not found in required_by" % n)
self.assertIn(n, required_by,
"'%s' not found in required_by" % n)
required_by = list(d.required_by('e2'))
self.assertEqual(1, len(required_by))
self.assertTrue('mid1' in required_by,
"'%s' not found in required_by" % n)
self.assertIn('mid1', required_by,
"'%s' not found in required_by" % n)
self.assertRaises(KeyError, d.required_by, 'foo')

4
heat/tests/test_identifier.py
View File

@ -253,8 +253,8 @@ class IdentifierTest(common.HeatTestCase):
def test_id_contains(self):
hi = identifier.HeatIdentifier('t', 's', ':/')
self.assertFalse("t" in hi)
self.assertTrue("stack_id" in hi)
self.assertNotIn("t", hi)
self.assertIn("stack_id", hi)
def test_path_escape(self):
hi = identifier.HeatIdentifier('t', 's', 'i', ':/')

2
heat/tests/test_template_format.py
View File

@ -57,7 +57,7 @@ class JsonToYamlTest(common.HeatTestCase):
self.assertEqual(u'2012-12-12', yml[u'HeatTemplateFormatVersion'],
file_name)
self.assertFalse(u'AWSTemplateFormatVersion' in yml, file_name)
self.assertNotIn(u'AWSTemplateFormatVersion', yml, file_name)
del(yml[u'HeatTemplateFormatVersion'])
jsn = template_format.parse(json_str)