openstack/oslo.db
Code Issues Proposed changes

Drop unittest2 usage

Browse Source 
unittest2 was needed for Python versions <= 2.6, so it has not been
needed for quite some time now. See unittest2 note on:

https://docs.python.org/2.7/library/unittest.html

This drops unittest2 in favor of the standard unittest package.

Change-Id: I40882f14ff2ac121764b432fc745b21ae751e321
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
Sean McGinnis 2020-01-12 02:38:39 -06:00
parent 3bdd1d1315
commit 82098f63bc
No known key found for this signature in database
GPG Key ID: CE7EE4BFAF8D70C8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lower-constraints.txt
View File

@ -66,6 +66,5 @@ testresources==2.0.0
testscenarios==0.4 testscenarios==0.4
testtools==2.2.0 testtools==2.2.0
traceback2==1.4.0 traceback2==1.4.0
unittest2==1.1.0
wrapt==1.7.0 wrapt==1.7.0
xattr==0.9.2 xattr==0.9.2

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

@ -16,7 +16,7 @@
"""Unit tests for SQLAlchemy and eventlet interaction.""" """Unit tests for SQLAlchemy and eventlet interaction."""
import logging import logging
import unittest2 import unittest
from oslo_utils import importutils from oslo_utils import importutils
import sqlalchemy as sa import sqlalchemy as sa
@ -46,8 +46,8 @@ class EventletTestMixin(object):
TmpTable.__table__.create(self.engine) TmpTable.__table__.create(self.engine)
self.addCleanup(lambda: TmpTable.__table__.drop(self.engine)) self.addCleanup(lambda: TmpTable.__table__.drop(self.engine))
@unittest2.skipIf(not tests.should_run_eventlet_tests(), @unittest.skipIf(not tests.should_run_eventlet_tests(),
'eventlet tests disabled unless TEST_EVENTLET=1') 'eventlet tests disabled unless TEST_EVENTLET=1')
def test_concurrent_transaction(self): def test_concurrent_transaction(self):
# Cause sqlalchemy to log executed SQL statements. Useful to # Cause sqlalchemy to log executed SQL statements. Useful to
# determine exactly what and when was sent to DB. # determine exactly what and when was sent to DB.