diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-06 13:53:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-06 13:53:17 +0000 |
| commit | f7f0f770af8ff3a5205339094f8be9a54d2cb18f (patch) | |
| tree | e224b991b6d68df125a64424e754ecc312f4c4ad /openstackclient | |
| parent | 20ad61b9d44daba59a0fd6378ee947621273f15f (diff) | |
| parent | 1626b63f5698918ac73ec407b1922fc006b0db66 (diff) | |
| download | python-openstackclient-f7f0f770af8ff3a5205339094f8be9a54d2cb18f.tar.gz | |
Merge "Use assertIn(A, B) instead of assertTrue(A in B )"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/common/test_module.py | 12 | ||||
| -rw-r--r-- | openstackclient/tests/image/v2/test_image.py | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/openstackclient/tests/common/test_module.py b/openstackclient/tests/common/test_module.py index 7d08dae7..8d5bb5f1 100644 --- a/openstackclient/tests/common/test_module.py +++ b/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) diff --git a/openstackclient/tests/image/v2/test_image.py b/openstackclient/tests/image/v2/test_image.py index 2b116b4e..830590c9 100644 --- a/openstackclient/tests/image/v2/test_image.py +++ b/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) |