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: I8d8bcc60640a06b3cacf18714c4a22802e6c9827

ironic/tests/unit/api/controllers/test_base.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from http import client as http_client
+from unittest import mock
 
-import mock
 from webob import exc
 
 from ironic.api.controllers import base as cbase

ironic/tests/unit/api/controllers/v1/test_allocation.py

@@ -15,10 +15,10 @@ Tests for the API /allocations/ methods.
 
 import datetime
 from http import client as http_client
+from unittest import mock
 from urllib import parse as urlparse
 
 import fixtures
-import mock
 from oslo_config import cfg
 from oslo_utils import timeutils
 from oslo_utils import uuidutils

ironic/tests/unit/api/controllers/v1/test_chassis.py

@@ -17,9 +17,9 @@ Tests for the API /chassis/ methods.
 
 import datetime
 from http import client as http_client
+from unittest import mock
 from urllib import parse as urlparse
 
-import mock
 from oslo_config import cfg
 from oslo_utils import timeutils
 from oslo_utils import uuidutils

ironic/tests/unit/api/controllers/v1/test_conductor.py

@@ -15,8 +15,8 @@ Tests for the API /conductors/ methods.
 
 import datetime
 from http import client as http_client
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_utils import timeutils
 from oslo_utils import uuidutils

ironic/tests/unit/api/controllers/v1/test_deploy_template.py

@@ -15,9 +15,9 @@ Tests for the API /deploy_templates/ methods.
 
 import datetime
 from http import client as http_client
+from unittest import mock
 from urllib import parse as urlparse
 
-import mock
 from oslo_config import cfg
 from oslo_utils import timeutils
 from oslo_utils import uuidutils

ironic/tests/unit/api/controllers/v1/test_driver.py

@@ -15,8 +15,8 @@
 
 from http import client as http_client
 import json
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from testtools import matchers
 

ironic/tests/unit/api/controllers/v1/test_event.py

@@ -14,8 +14,7 @@ Tests for the API /events methods.
 """
 
 from http import client as http_client
-
+from unittest import mock
-import mock
 
 from ironic.api.controllers import base as api_base
 from ironic.api.controllers.v1 import types

ironic/tests/unit/api/controllers/v1/test_expose.py

@@ -19,8 +19,8 @@ import inspect
 import json
 import os
 import sys
+from unittest import mock
 
-import mock
 from oslo_utils import uuidutils
 import pecan.rest
 import pecan.testing

ironic/tests/unit/api/controllers/v1/test_node.py

@@ -17,10 +17,10 @@ import datetime
 from http import client as http_client
 import json
 import os
+from unittest import mock
 from urllib import parse as urlparse
 
 import fixtures
-import mock
 from oslo_config import cfg
 from oslo_utils import timeutils
 from oslo_utils import uuidutils

ironic/tests/unit/api/controllers/v1/test_notification_utils.py

@@ -12,7 +12,8 @@
 
 """Test class for ironic-api notification utilities."""
 
-import mock
+from unittest import mock
+
 from oslo_utils import uuidutils
 
 from ironic.api.controllers.v1 import notification_utils as notif_utils

ironic/tests/unit/api/controllers/v1/test_port.py

@@ -16,9 +16,9 @@ Tests for the API /ports/ methods.
 import datetime
 from http import client as http_client
 import types
+from unittest import mock
 from urllib import parse as urlparse
 
-import mock
 from oslo_config import cfg
 from oslo_utils import timeutils
 from oslo_utils import uuidutils

ironic/tests/unit/api/controllers/v1/test_portgroup.py

@@ -15,9 +15,9 @@ Tests for the API /portgroups/ methods.
 
 import datetime
 from http import client as http_client
+from unittest import mock
 from urllib import parse as urlparse
 
-import mock
 from oslo_config import cfg
 from oslo_utils import timeutils
 from oslo_utils import uuidutils

ironic/tests/unit/api/controllers/v1/test_ramdisk.py

@@ -16,9 +16,9 @@ Tests for the API /lookup/ methods.
 """
 
 from http import client as http_client
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_config import cfg
 from oslo_utils import uuidutils
 

ironic/tests/unit/api/controllers/v1/test_root.py

@@ -12,7 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from webob import exc as webob_exc
 
 from ironic.api.controllers import v1 as v1_api

ironic/tests/unit/api/controllers/v1/test_types.py

@@ -17,8 +17,8 @@
 
 from http import client as http_client
 import platform
+from unittest import mock
 
-import mock
 from pecan import rest
 
 from ironic.api.controllers.v1 import types

ironic/tests/unit/api/controllers/v1/test_utils.py

@@ -15,8 +15,8 @@
 #    under the License.
 
 from http import client as http_client
+from unittest import mock
 
-import mock
 import os_traits
 from oslo_config import cfg
 from oslo_utils import uuidutils

ironic/tests/unit/api/controllers/v1/test_versions.py

@@ -16,8 +16,7 @@ Tests for the versions constants and methods.
 """
 
 import re
-
+from unittest import mock
-import mock
 
 from ironic.api.controllers.v1 import versions
 from ironic.common import release_mappings

ironic/tests/unit/api/controllers/v1/test_volume_connector.py

@@ -17,9 +17,9 @@ Tests for the API /volume connectors/ methods.
 
 import datetime
 from http import client as http_client
+from unittest import mock
 from urllib import parse as urlparse
 
-import mock
 from oslo_config import cfg
 from oslo_utils import timeutils
 from oslo_utils import uuidutils

ironic/tests/unit/api/controllers/v1/test_volume_target.py

@@ -17,9 +17,9 @@ Tests for the API /volume targets/ methods.
 
 import datetime
 from http import client as http_client
+from unittest import mock
 from urllib import parse as urlparse
 
-import mock
 from oslo_config import cfg
 from oslo_utils import timeutils
 from oslo_utils import uuidutils

lower-constraints.txt

@@ -50,7 +50,6 @@ logutils==0.3.5
 Mako==1.1.2
 MarkupSafe==1.1.1
 mccabe==0.6.1
-mock==4.0.2
 monotonic==1.5
 mox3==1.0.0
 msgpack-python==0.5.6