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

Author: Jenkins

openstackclient/tests/common/test_module.py

@@ -106,8 +106,8 @@ def test_module_list_no_options(self):
         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 @@ def test_module_list_all(self):
         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)

openstackclient/tests/image/v2/test_image.py

@@ -1128,7 +1128,7 @@ def test_image_set_tag_merge(self):
         # 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 @@ def test_image_set_tag_merge_dupe(self):
         # 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)