Merge "Use unittest.mock instead of third party mock"

This commit is contained in:
Zuul 2020-04-06 15:06:02 +00:00 committed by Gerrit Code Review
commit 314c4e7915
4 changed files with 3 additions and 4 deletions

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
msgpack-python==0.4.0 msgpack-python==0.4.0
netaddr==0.7.18 netaddr==0.7.18

View File

@ -20,11 +20,11 @@ import re
import signal import signal
import sys import sys
import threading import threading
from unittest import mock
# needed to get greenthreads # needed to get greenthreads
import fixtures import fixtures
import greenlet import greenlet
import mock
from oslotest import base from oslotest import base
import six import six

View File

@ -14,9 +14,9 @@
# under the License. # under the License.
import threading import threading
from unittest import mock
import greenlet import greenlet
import mock
from oslo_config import cfg from oslo_config import cfg
from oslotest import base from oslotest import base
import six import six

View File

@ -13,8 +13,8 @@
# under the License. # under the License.
import copy import copy
from unittest import mock
import mock
from oslotest import base from oslotest import base
import six import six