openstack/python-openstackclient
Code Issues Proposed changes

Merge "Use assertIn(A, B) instead of assertTrue(A in B )"

Browse Source
This commit is contained in:
Jenkins 2016-09-06 13:53:17 +00:00 committed by Gerrit Code Review
commit f7f0f770af
2 changed files with 8 additions and 8 deletions
openstackclient/tests
common
test_module.py
image/v2
test_image.py

12
openstackclient/tests/common/test_module.py

@ -106,8 +106,8 @@ class TestModuleList(utils.TestCommand):
columns, data = self.cmd.take_action(parsed_args)
# Additional modules may be present, just check our additions
self.assertTrue(module_name_1 in columns)
self.assertTrue(module_version_1 in data)
self.assertIn(module_name_1, columns)
self.assertIn(module_version_1, data)
def test_module_list_all(self):
arglist = [
@ -124,7 +124,7 @@ class TestModuleList(utils.TestCommand):
columns, data = self.cmd.take_action(parsed_args)
# Additional modules may be present, just check our additions
self.assertTrue(module_name_1 in columns)
self.assertTrue(module_name_2 in columns)
self.assertTrue(module_version_1 in data)
self.assertTrue(module_version_2 in data)
self.assertIn(module_name_1, columns)
self.assertIn(module_name_2, columns)
self.assertIn(module_version_1, data)
self.assertIn(module_version_2, data)

4
openstackclient/tests/image/v2/test_image.py

@ -1128,7 +1128,7 @@ class TestImageSet(TestImage):
# ImageManager.update(image, **kwargs)
a, k = self.images_mock.update.call_args
self.assertEqual(image_fakes.image_id, a[0])
self.assertTrue('tags' in k)
self.assertIn('tags', k)
self.assertEqual(set(kwargs['tags']), set(k['tags']))
self.assertIsNone(result)
@ -1154,7 +1154,7 @@ class TestImageSet(TestImage):
# ImageManager.update(image, **kwargs)
a, k = self.images_mock.update.call_args
self.assertEqual(image_fakes.image_id, a[0])
self.assertTrue('tags' in k)
self.assertIn('tags', k)
self.assertEqual(set(kwargs['tags']), set(k['tags']))
self.assertIsNone(result)