openstack
/
oslo.rootwrap
Code Issues Proposed changes

Use unittest.mock instead of third party mock 

Now that we no longer support py27, we can use the standard library
unittest.mock module instead of the third party mock lib.

Change-Id: Icd7019c924386fb9c047fc55fb98e45fcb79f2eb
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
Sean McGinnis 2020-03-31 14:16:41 -05:00
parent 23a534b9f5
commit fd21b6e096
No known key found for this signature in database
GPG Key ID: CE7EE4BFAF8D70C8
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lower-constraints.txt
View File

@ -19,7 +19,6 @@ keystoneauth1==3.4.0
linecache2==1.0.0 linecache2==1.0.0
MarkupSafe==1.0 MarkupSafe==1.0
mccabe==0.2.1 mccabe==0.2.1
mock==2.0.0
mox3==0.20.0 mox3==0.20.0
openstackdocstheme==1.20.0 openstackdocstheme==1.20.0
os-client-config==1.28.0 os-client-config==1.28.0

2
oslo_rootwrap/tests/test_functional.py
View File

@ -23,6 +23,7 @@ import signal
import sys import sys
import threading import threading
import time import time
from unittest import mock
try: try:
import eventlet import eventlet
@ -30,7 +31,6 @@ except ImportError:
eventlet = None eventlet = None
import fixtures import fixtures
import mock
import six import six
import testtools import testtools
from testtools import content from testtools import content

2
oslo_rootwrap/tests/test_rootwrap.py
View File

@ -16,10 +16,10 @@ import logging
import logging.handlers import logging.handlers
import os import os
import tempfile import tempfile
from unittest import mock
import uuid import uuid
import fixtures import fixtures
import mock
from six import moves from six import moves
import testtools import testtools

4
test-requirements.txt
View File

@ -11,10 +11,6 @@ stestr>=2.0.0 # Apache-2.0
# this is required for the docs build jobs # this is required for the docs build jobs
oslotest>=3.2.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0
# mocking framework
mock>=2.0.0 # BSD
# rootwrap daemon's client should be verified to run in eventlet # rootwrap daemon's client should be verified to run in eventlet
eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT