openstack/openstack-ansible
Code Issues Proposed changes

Merge "Replace 'assertTrue(a in b)' with 'assertIn(a, b)'"

Browse Source
This commit is contained in:
Jenkins 2017-02-07 03:29:45 +00:00 committed by Gerrit Code Review
commit e63a453785
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_inventory.py
View File

@ -1239,7 +1239,7 @@ class TestConfigMatchesEnvironment(unittest.TestCase):
with warnings.catch_warnings(record=True) as wl: with warnings.catch_warnings(record=True) as wl:
di._check_all_conf_groups_present(bad_config, self.env) di._check_all_conf_groups_present(bad_config, self.env)
self.assertEqual(1, len(wl)) self.assertEqual(1, len(wl))
self.assertTrue('bogus_key' in str(wl[0].message)) self.assertIn('bogus_key', str(wl[0].message))
def test_multiple_extra_keys(self): def test_multiple_extra_keys(self):
bad_config = get_config() bad_config = get_config()
@ -1251,8 +1251,8 @@ class TestConfigMatchesEnvironment(unittest.TestCase):
self.assertEqual(2, len(wl)) self.assertEqual(2, len(wl))
warn_msgs = [str(warn.message) for warn in wl] warn_msgs = [str(warn.message) for warn in wl]
warn_msgs.sort() warn_msgs.sort()
self.assertTrue('bogus_key1' in warn_msgs[0]) self.assertIn('bogus_key1', warn_msgs[0])
self.assertTrue('bogus_key2' in warn_msgs[1]) self.assertIn('bogus_key2', warn_msgs[1])
def test_confirm_exclusions(self): def test_confirm_exclusions(self):
"""Ensure the excluded keys in the function are present.""" """Ensure the excluded keys in the function are present."""