Using new style assertions instead of old style assertions

Replace 'assertTrue(a in b)' with 'assertIn(a, b)'.
Replace 'assertTrue(a not in b)' with 'assertNotIn(a, b)'.
Replace 'assertFalse(a in b)' with 'assertNotIn(a, b)'.

Change-Id: Ifcb490481ed58b0223029cc257b22a53ad0e5a42

4 files changed, 23 insertions, 23 deletions

diff --git a/oslo_db/tests/sqlalchemy/test_exc_filters.py b/oslo_db/tests/sqlalchemy/test_exc_filters.py
index 5f1c113..e3a3a3a 100644
--- a/oslo_db/tests/sqlalchemy/test_exc_filters.py
+++ b/oslo_db/tests/sqlalchemy/test_exc_filters.py
@@ -1099,7 +1099,7 @@ class IntegrationTest(test_base.DbTestCase):
         foo = self.Foo(counter=sqla.func.imfake(123))
         _session.add(foo)
         matched = self.assertRaises(sqla.exc.OperationalError, _session.flush)
-        self.assertTrue("no such function" in str(matched))
+        self.assertIn("no such function", str(matched))
 
     def test_query_wrapper_operational_error(self):
         """test an operational error from query.all() raised as-is."""
@@ -1111,7 +1111,7 @@ class IntegrationTest(test_base.DbTestCase):
         q = _session.query(self.Foo).filter(
             self.Foo.counter == sqla.func.imfake(123))
         matched = self.assertRaises(sqla.exc.OperationalError, q.all)
-        self.assertTrue("no such function" in str(matched))
+        self.assertIn("no such function", str(matched))
 
 
 class TestDBDisconnected(TestsExceptionFilter):
diff --git a/oslo_db/tests/sqlalchemy/test_models.py b/oslo_db/tests/sqlalchemy/test_models.py
index 674993d..1699bbc 100644
--- a/oslo_db/tests/sqlalchemy/test_models.py
+++ b/oslo_db/tests/sqlalchemy/test_models.py
@@ -66,9 +66,9 @@ class ModelBaseTest(test_base.DbTestCase):
         mb.update(h)
         for key in h.keys():
             # Test 'in' syntax (instead of using .assertIn)
-            self.assertTrue(key in mb)
+            self.assertIn(key, mb)
 
-        self.assertFalse('non-existent-key' in mb)
+        self.assertNotIn('non-existent-key', mb)
 
     def test_modelbase_contains_exc(self):
         class ErrorModel(models.ModelBase):
@@ -79,7 +79,7 @@ class ModelBaseTest(test_base.DbTestCase):
         model = ErrorModel()
         model.update({'attr': 5})
 
-        self.assertTrue('attr' in model)
+        self.assertIn('attr', model)
         self.assertRaises(ValueError, lambda: 'bug' in model)
 
     def test_modelbase_items_iteritems(self):
diff --git a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
index cc37017..9f1e655 100644
--- a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
+++ b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
@@ -219,7 +219,7 @@ class MySQLDefaultModeTestCase(test_base.MySQLOpportunisticTestCase):
                 "SHOW VARIABLES LIKE 'sql_mode'"
             ).first()[1]
 
-        self.assertTrue("TRADITIONAL" in sql_mode)
+        self.assertIn("TRADITIONAL", sql_mode)
 
 
 class MySQLModeTestCase(test_base.MySQLOpportunisticTestCase):
@@ -439,12 +439,12 @@ class MysqlConnectTest(test_base.MySQLOpportunisticTestCase):
 
     def _assert_sql_mode(self, engine, sql_mode_present, sql_mode_non_present):
         mode = engine.execute("SHOW VARIABLES LIKE 'sql_mode'").fetchone()[1]
-        self.assertTrue(
-            sql_mode_present in mode
+        self.assertIn(
+            sql_mode_present, mode
         )
         if sql_mode_non_present:
-            self.assertTrue(
-                sql_mode_non_present not in mode
+            self.assertNotIn(
+                sql_mode_non_present, mode
             )
 
     def test_set_mode_traditional(self):
@@ -575,16 +575,16 @@ class CreateEngineTest(oslo_test.BaseTestCase):
                 max_pool_size=10, max_overflow=10)
 
             # queuepool arguments are not peresnet
-            self.assertTrue(
-                'pool_size' not in self.args)
-            self.assertTrue(
-                'max_overflow' not in self.args)
+            self.assertNotIn(
+                'pool_size', self.args)
+            self.assertNotIn(
+                'max_overflow', self.args)
 
             self.assertEqual(False,
                              self.args['connect_args']['check_same_thread'])
 
             # due to memory connection
-            self.assertTrue('poolclass' in self.args)
+            self.assertIn('poolclass', self.args)
 
     def test_sqlite_file_pool_args(self):
         engines._init_connection_args(
@@ -592,15 +592,15 @@ class CreateEngineTest(oslo_test.BaseTestCase):
             max_pool_size=10, max_overflow=10)
 
         # queuepool arguments are not peresnet
-        self.assertTrue('pool_size' not in self.args)
-        self.assertTrue(
-            'max_overflow' not in self.args)
+        self.assertNotIn('pool_size', self.args)
+        self.assertNotIn(
+            'max_overflow', self.args)
 
         self.assertFalse(self.args['connect_args'])
 
         # NullPool is the default for file based connections,
         # no need to specify this
-        self.assertTrue('poolclass' not in self.args)
+        self.assertNotIn('poolclass', self.args)
 
     def _test_mysql_connect_args_default(self, connect_args):
         if six.PY3:
@@ -650,7 +650,7 @@ class CreateEngineTest(oslo_test.BaseTestCase):
             self.args
         )
 
-        self.assertFalse('raise_on_warnings' in self.args['connect_args'])
+        self.assertNotIn('raise_on_warnings', self.args['connect_args'])
 
     def test_thread_checkin(self):
         with mock.patch("sqlalchemy.event.listens_for"):
diff --git a/oslo_db/tests/sqlalchemy/test_utils.py b/oslo_db/tests/sqlalchemy/test_utils.py
index a1b8d1d..2e4b865 100644
--- a/oslo_db/tests/sqlalchemy/test_utils.py
+++ b/oslo_db/tests/sqlalchemy/test_utils.py
@@ -501,7 +501,7 @@ class TestMigrationUtils(db_test_base.DbTestCase):
 
         self.assertEqual(len(expected_ids), len(real_ids))
         for id_ in expected_ids:
-            self.assertTrue(id_ in real_ids)
+            self.assertIn(id_, real_ids)
 
     def test_drop_dup_entries_in_file_conn(self):
         table_name = "__test_tmp_table__"
@@ -541,7 +541,7 @@ class TestMigrationUtils(db_test_base.DbTestCase):
                    self.engine.execute(rows_select).fetchall()]
         self.assertEqual(len(expected_values), len(row_ids))
         for value in expected_values:
-            self.assertTrue(value['id'] in row_ids)
+            self.assertIn(value['id'], row_ids)
 
         deleted_rows_select = base_select.where(
             table.c.deleted == table.c.id)
@@ -551,7 +551,7 @@ class TestMigrationUtils(db_test_base.DbTestCase):
         self.assertEqual(len(values) - len(row_ids),
                          len(deleted_rows_ids))
         for value in soft_deleted_values:
-            self.assertTrue(value['id'] in deleted_rows_ids)
+            self.assertIn(value['id'], deleted_rows_ids)
 
     def test_change_deleted_column_type_does_not_drop_index(self):
         table_name = 'abc'