openstack
/
oslo.db
Code Issues Proposed changes

Use skipTest() method instead of deprecated skip() 

The method for skipping a test in unittest is skipTest(). testtools also
provides skip(), but that is deprecated. This eliminates the deprecation
warnings by switching to the recommended skipTest().

Change-Id: I45da95958e6f65475beab0d7a3c6de6604fa82d7
This commit is contained in:
Zane Bitter 2017-10-19 18:13:31 -04:00
parent 128e5438b1
commit 5be38d2c66
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oslo_db/sqlalchemy/test_base.py
View File

@ -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

2
oslo_db/sqlalchemy/test_fixtures.py
View File

@ -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)

2
oslo_db/tests/sqlalchemy/test_async_eventlet.py
View File

@ -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()

2
oslo_db/tests/sqlalchemy/test_exc_filters.py
View File

@ -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)

4
oslo_db/tests/sqlalchemy/test_fixtures.py
View File

@ -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):

2
oslo_db/tests/sqlalchemy/test_ndb.py
View File

@ -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)

4
oslo_db/tests/sqlalchemy/test_provision.py
View File

@ -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(