diff options
| -rw-r--r-- | oslo_db/sqlalchemy/test_base.py | 4 | ||||
| -rw-r--r-- | oslo_db/sqlalchemy/test_fixtures.py | 2 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_async_eventlet.py | 2 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_exc_filters.py | 2 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_fixtures.py | 4 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_ndb.py | 2 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_provision.py | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/oslo_db/sqlalchemy/test_base.py b/oslo_db/sqlalchemy/test_base.py index 4c9c2c7..14e9d02 100644 --- a/oslo_db/sqlalchemy/test_base.py +++ b/oslo_db/sqlalchemy/test_base.py @@ -70,7 +70,7 @@ class DbFixture(fixtures.Fixture): if not self.test._has_db_resource(): msg = self.test._get_db_resource_not_available_reason() if self.test.SKIP_ON_UNAVAILABLE_DB: - self.test.skip(msg) + self.test.skipTest(msg) else: self.test.fail(msg) @@ -216,7 +216,7 @@ def backend_specific(*dialects): 'only on %s. Current engine is %s.') args = (reflection.get_callable_name(f), ', '.join(dialects), self.engine.name) - self.skip(msg % args) + self.skipTest(msg % args) else: return f(self) return ins_wrap diff --git a/oslo_db/sqlalchemy/test_fixtures.py b/oslo_db/sqlalchemy/test_fixtures.py index 57980ff..f3b5c1c 100644 --- a/oslo_db/sqlalchemy/test_fixtures.py +++ b/oslo_db/sqlalchemy/test_fixtures.py @@ -533,7 +533,7 @@ class OpportunisticDBTestMixin(object): if not fixture._has_db_resource(): msg = fixture._get_db_resource_not_available_reason() if self.SKIP_ON_UNAVAILABLE_DB: - self.skip(msg) + self.skipTest(msg) else: self.fail(msg) diff --git a/oslo_db/tests/sqlalchemy/test_async_eventlet.py b/oslo_db/tests/sqlalchemy/test_async_eventlet.py index 34d1f32..7eebed4 100644 --- a/oslo_db/tests/sqlalchemy/test_async_eventlet.py +++ b/oslo_db/tests/sqlalchemy/test_async_eventlet.py @@ -77,7 +77,7 @@ class EventletTestMixin(object): eventlet = importutils.try_import('eventlet') if eventlet is None: - return self.skip('eventlet is required for this test') + return self.skipTest('eventlet is required for this test') a_ready = eventlet.event.Event() a_proceed = eventlet.event.Event() diff --git a/oslo_db/tests/sqlalchemy/test_exc_filters.py b/oslo_db/tests/sqlalchemy/test_exc_filters.py index 93ad770..9c2b417 100644 --- a/oslo_db/tests/sqlalchemy/test_exc_filters.py +++ b/oslo_db/tests/sqlalchemy/test_exc_filters.py @@ -768,7 +768,7 @@ class TestDBDataErrorSQLite(_SQLAExceptionMatcher, test_base.DbTestCase): super(TestDBDataErrorSQLite, self).setUp() if six.PY3: - self.skip("SQLite database supports unicode value for python3") + self.skipTest("SQLite database supports unicode value for python3") meta = sqla.MetaData(bind=self.engine) diff --git a/oslo_db/tests/sqlalchemy/test_fixtures.py b/oslo_db/tests/sqlalchemy/test_fixtures.py index b769e20..df905e8 100644 --- a/oslo_db/tests/sqlalchemy/test_fixtures.py +++ b/oslo_db/tests/sqlalchemy/test_fixtures.py @@ -219,8 +219,8 @@ class LegacyBaseClassTest(oslo_test_base.BaseTestCase): try: provision.DatabaseResource(base_cls.FIXTURE.DRIVER) except exception.BackendNotAvailable: - self.skip("Backend %s is not available" % - base_cls.FIXTURE.DRIVER) + self.skipTest("Backend %s is not available" % + base_cls.FIXTURE.DRIVER) class SomeTest(base_cls): def runTest(self): diff --git a/oslo_db/tests/sqlalchemy/test_ndb.py b/oslo_db/tests/sqlalchemy/test_ndb.py index 1d84f41..421befe 100644 --- a/oslo_db/tests/sqlalchemy/test_ndb.py +++ b/oslo_db/tests/sqlalchemy/test_ndb.py @@ -176,7 +176,7 @@ class NDBOpportunisticTestCase( try: self.test_table.create(self.engine) except exception.DBNotSupportedError: - self.skip("MySQL NDB Cluster not available") + self.skipTest("MySQL NDB Cluster not available") def test_ndb_enabled(self): self.init_db(True) diff --git a/oslo_db/tests/sqlalchemy/test_provision.py b/oslo_db/tests/sqlalchemy/test_provision.py index 8f931bd..8f0928f 100644 --- a/oslo_db/tests/sqlalchemy/test_provision.py +++ b/oslo_db/tests/sqlalchemy/test_provision.py @@ -176,7 +176,7 @@ class RetainSchemaTest(oslo_test_base.BaseTestCase): database_resource = provision.DatabaseResource( self.DRIVER, provision_new_database=True) except exception.BackendNotAvailable: - self.skip("database not available") + self.skipTest("database not available") schema_resource = provision.SchemaResource( database_resource, self._gen_schema) @@ -244,7 +244,7 @@ class AdHocURLTest(oslo_test_base.BaseTestCase): mysql_backend = provision.Backend.backend_for_database_type( "mysql") except exception.BackendNotAvailable: - self.skip("mysql backend not available") + self.skipTest("mysql backend not available") mysql_backend.create_named_database("adhoc_test") self.addCleanup( |