Use unittest.mock instead of mock

The mock third party library was needed for mock support in py2
runtimes. Since we now only support py36 and later, we can use the
standard lib unittest.mock module instead.

Change-Id: Ib169e3deb7ddb2bc93a206ebec4043552281aa7f
This commit is contained in:
Hervé Beraud 2021-01-05 09:14:51 +01:00 committed by Michael Johnson
parent f6c7664bad
commit 14a5c0f237
4 changed files with 3 additions and 4 deletions

View File

@ -16,9 +16,9 @@
import collections import collections
import logging import logging
from unittest import mock
import fixtures import fixtures
import mock
from oslotest import base from oslotest import base
import six import six

View File

@ -15,10 +15,10 @@
# under the License. # under the License.
import socket import socket
from unittest import mock
from taskflow.engines.worker_based import proxy from taskflow.engines.worker_based import proxy
from taskflow import test from taskflow import test
from taskflow.test import mock
from taskflow.utils import threading_utils from taskflow.utils import threading_utils

View File

@ -26,7 +26,6 @@ psycopg2>=2.8.0 # LGPL/ZPL
pydotplus>=2.0.2 # MIT License pydotplus>=2.0.2 # MIT License
hacking<2.1,>=2.0 hacking<2.1,>=2.0
oslotest>=3.2.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0
mock>=2.0.0 # BSD
testtools>=2.2.0 # MIT testtools>=2.2.0 # MIT
testscenarios>=0.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD
stestr>=2.0.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0

View File

@ -14,7 +14,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import mock from unittest import mock
import optparse import optparse
import os import os