openstack
/
heat
Code Issues Proposed changes

Merge "Trivial: Replace 'assertTrue(a not in b)' with 'assertNotIn(a, b)'"

This commit is contained in:
Jenkins 2016-09-26 02:39:24 +00:00 committed by Gerrit Code Review
parent a7106c988f 655239682d
commit adc05d8415
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
heat/tests/openstack/heat/test_resource_chain.py
View File

@ -61,7 +61,7 @@ class ResourceChainTest(common.HeatTestCase):
resource = tmpl['resources']['0']
self.assertEqual('OS::Heat::SoftwareConfig', resource['type'])
self.assertEqual(RESOURCE_PROPERTIES, resource['properties'])
self.assertTrue('depends_on' not in resource)
self.assertNotIn('depends_on', resource)
resource = tmpl['resources']['1']
self.assertEqual('OS::Heat::StructuredConfig', resource['type'])
@ -83,10 +83,10 @@ class ResourceChainTest(common.HeatTestCase):
# isn't present
tmpl = child_template.t
resource = tmpl['resources']['0']
self.assertTrue('depends_on' not in resource)
self.assertNotIn('depends_on', resource)
resource = tmpl['resources']['1']
self.assertTrue('depends_on' not in resource)
self.assertNotIn('depends_on', resource)
def test_child_template_default_concurrent(self):
# Setup
@ -102,7 +102,7 @@ class ResourceChainTest(common.HeatTestCase):
# isn't present
tmpl = child_template.t
resource = tmpl['resources']['0']
self.assertTrue('depends_on' not in resource)
self.assertNotIn('depends_on', resource)
resource = tmpl['resources']['1']
self.assertEqual(['0'], resource['depends_on'])
@ -119,7 +119,7 @@ class ResourceChainTest(common.HeatTestCase):
# Verify
tmpl = child_template.t
# No error, but no resources to create
self.assertTrue('resources' not in tmpl)
self.assertNotIn('resources', tmpl)
# Sanity check that it's actually a template
self.assertIn('heat_template_version', tmpl)