diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-10-26 20:33:42 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-10-26 20:33:42 +0000 |
commit | af1ef7443cf47dfcaaba1d19363401531846455c (patch) | |
tree | f091c04e934a797aae3e57d31e9011a71ae57366 | |
parent | 499494fbd0e386d5dc080a7b0fea4af0b4f6e531 (diff) | |
parent | a65a42b5c35b47992b23ddfb3261bc744f98c261 (diff) | |
download | oslo-db-af1ef7443cf47dfcaaba1d19363401531846455c.tar.gz |
Merge "Change assertTrue(isinstance()) by optimal assert"
-rw-r--r-- | oslo_db/tests/sqlalchemy/test_utils.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/oslo_db/tests/sqlalchemy/test_utils.py b/oslo_db/tests/sqlalchemy/test_utils.py index 1471ff1..a1b8d1d 100644 --- a/oslo_db/tests/sqlalchemy/test_utils.py +++ b/oslo_db/tests/sqlalchemy/test_utils.py @@ -593,7 +593,7 @@ class TestMigrationUtils(db_test_base.DbTestCase): utils.change_deleted_column_type_to_id_type(self.engine, table_name) table = utils.get_table(self.engine, table_name) - self.assertTrue(isinstance(table.c.deleted.type, Integer)) + self.assertIsInstance(table.c.deleted.type, Integer) def test_change_deleted_column_type_to_id_type_string(self): table_name = 'abc' @@ -604,7 +604,7 @@ class TestMigrationUtils(db_test_base.DbTestCase): utils.change_deleted_column_type_to_id_type(self.engine, table_name) table = utils.get_table(self.engine, table_name) - self.assertTrue(isinstance(table.c.deleted.type, String)) + self.assertIsInstance(table.c.deleted.type, String) @db_test_base.backend_specific('sqlite') def test_change_deleted_column_type_to_id_type_custom(self): @@ -627,7 +627,7 @@ class TestMigrationUtils(db_test_base.DbTestCase): table = utils.get_table(self.engine, table_name) - self.assertTrue(isinstance(table.c.deleted.type, Integer)) + self.assertIsInstance(table.c.deleted.type, Integer) def test_change_deleted_column_type_to_boolean(self): expected_types = {'mysql': mysql.TINYINT, @@ -686,8 +686,8 @@ class TestMigrationUtils(db_test_base.DbTestCase): # but sqlalchemy will set it to NullType. This has # been fixed upstream in recent SA versions if SA_VERSION < (0, 9, 0): - self.assertTrue(isinstance(table.c.foo.type, NullType)) - self.assertTrue(isinstance(table.c.deleted.type, Boolean)) + self.assertIsInstance(table.c.foo.type, NullType) + self.assertIsInstance(table.c.deleted.type, Boolean) def test_detect_boolean_deleted_constraint_detection(self): table_name = 'abc' |