diff options
Diffstat (limited to 'oslo_db')
-rw-r--r-- | oslo_db/tests/sqlalchemy/test_exc_filters.py | 16 | ||||
-rw-r--r-- | oslo_db/tests/sqlalchemy/test_fixtures.py | 8 |
2 files changed, 6 insertions, 18 deletions
diff --git a/oslo_db/tests/sqlalchemy/test_exc_filters.py b/oslo_db/tests/sqlalchemy/test_exc_filters.py index 0451c89..b7e0f91 100644 --- a/oslo_db/tests/sqlalchemy/test_exc_filters.py +++ b/oslo_db/tests/sqlalchemy/test_exc_filters.py @@ -663,19 +663,11 @@ class TestExceptionCauseMySQLSavepoint(test_base._MySQLOpportunisticTestCase): # session even though the SAVEPOINT was lost; # the net result here is that one exception is thrown # instead of two. This is SQLAlchemy ticket #3680 - self.assertTrue( - isinstance( - dbe_inner.cause, - exception.DBDuplicateEntry - ) - ) + self.assertIsInstance( + dbe_inner.cause, exception.DBDuplicateEntry) + except exception.DBError as dbe_outer: - self.assertTrue( - isinstance( - dbe_outer.cause, - exception.DBDuplicateEntry - ) - ) + self.AssertIsInstance(dbe_outer.cause, exception.DBDuplicateEntry) # resets itself afterwards try: diff --git a/oslo_db/tests/sqlalchemy/test_fixtures.py b/oslo_db/tests/sqlalchemy/test_fixtures.py index 6b9fb20..97f8d64 100644 --- a/oslo_db/tests/sqlalchemy/test_fixtures.py +++ b/oslo_db/tests/sqlalchemy/test_fixtures.py @@ -250,9 +250,7 @@ class TestLoadHook(unittest.TestCase): found_tests = loader.discover(start_dir, pattern="test_fixtures.py") new_loader = load_tests(loader, found_tests, "test_fixtures.py") - self.assertTrue( - isinstance(new_loader, testresources.OptimisingTestSuite) - ) + self.assertIsInstance(new_loader, testresources.OptimisingTestSuite) actual_tests = unittest.TestSuite( testscenarios.generate_scenarios(found_tests) @@ -274,9 +272,7 @@ class TestLoadHook(unittest.TestCase): new_loader = load_tests( loader, unittest.suite.TestSuite(), "test_fixtures.py") - self.assertTrue( - isinstance(new_loader, testresources.OptimisingTestSuite) - ) + self.assertIsInstance(new_loader, testresources.OptimisingTestSuite) actual_tests = unittest.TestSuite( testscenarios.generate_scenarios( |