From 1626b63f5698918ac73ec407b1922fc006b0db66 Mon Sep 17 00:00:00 2001
From: Bin Zhou <zhou.bin9@zte.com.cn>
Date: Fri, 2 Sep 2016 12:05:58 +0800
Subject: [PATCH] Use assertIn(A, B) instead of assertTrue(A in B )
Developers should use assertIn(A, B) instead of assertTrue(A in B ).
TrivialFix
Change-Id: I0d7c542272315590536c427a8865e49660361e55
---
openstackclient/tests/common/test_module.py | 12 ++++++------
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 7d08dae7b7..8d5bb5f1f7 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 2b116b4e82..830590c96a 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)