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: I94daf175305b5fd31380088e27ecec2083f89e59
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
Sean McGinnis 2020-04-18 11:53:23 -05:00
parent aaa7d38cdc
commit 8d2ac297fd
No known key found for this signature in database
GPG Key ID: CE7EE4BFAF8D70C8
9 changed files with 9 additions and 9 deletions

View File

@ -12,8 +12,8 @@
# limitations under the License. # limitations under the License.
import subprocess import subprocess
from unittest import mock
import mock
from oslo_concurrency import processutils from oslo_concurrency import processutils
from ironic_lib.tests import base from ironic_lib.tests import base

View File

@ -13,7 +13,8 @@
# 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
from testtools.matchers import HasLength from testtools.matchers import HasLength
from ironic_lib import disk_partitioner from ironic_lib import disk_partitioner

View File

@ -18,8 +18,8 @@ import os
import shutil import shutil
import stat import stat
import tempfile import tempfile
from unittest import mock
import mock
from oslo_concurrency import processutils from oslo_concurrency import processutils
from oslo_config import cfg from oslo_config import cfg
from oslo_serialization import base64 from oslo_serialization import base64

View File

@ -13,8 +13,8 @@
import re import re
from unittest import mock
import mock
from oslo_config import cfg from oslo_config import cfg
from ironic_lib import exception from ironic_lib import exception

View File

@ -11,8 +11,8 @@
# under the License. # under the License.
import socket import socket
from unittest import mock
import mock
from oslo_config import cfg from oslo_config import cfg
import zeroconf import zeroconf

View File

@ -14,8 +14,8 @@
# under the License. # under the License.
import types import types
from unittest import mock
import mock
from oslo_utils import reflection from oslo_utils import reflection
from ironic_lib import metrics as metricslib from ironic_lib import metrics as metricslib

View File

@ -14,8 +14,8 @@
# under the License. # under the License.
import socket import socket
from unittest import mock
import mock
from ironic_lib import metrics_statsd from ironic_lib import metrics_statsd
from ironic_lib.tests import base from ironic_lib.tests import base

View File

@ -17,8 +17,8 @@ import copy
import errno import errno
import os import os
import os.path import os.path
from unittest import mock
import mock
from oslo_concurrency import processutils from oslo_concurrency import processutils
from oslo_config import cfg from oslo_config import cfg

View File

@ -6,7 +6,6 @@ coverage!=4.4,>=4.0 # Apache-2.0
eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
flake8-import-order>=0.13 # LGPLv3 flake8-import-order>=0.13 # LGPLv3
hacking>=3.0.0,<3.1.0 # Apache-2.0 hacking>=3.0.0,<3.1.0 # Apache-2.0
mock>=2.0.0 # BSD
stestr>=1.0.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0
testscenarios>=0.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD