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

kuryr_kubernetes/tests/unit/cmd/eventlet/test_controller.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.tests import base as test_base
 

kuryr_kubernetes/tests/unit/cmd/test_daemon.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.tests import base as test_base
 

kuryr_kubernetes/tests/unit/cmd/test_status.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 import io
+from unittest import mock
 
-import mock
 from oslo_serialization import jsonutils
 
 from kuryr_kubernetes.cmd import status

kuryr_kubernetes/tests/unit/cni/plugins/test_k8s_cni_registry.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 

kuryr_kubernetes/tests/unit/cni/test_api.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from io import StringIO
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 import requests

kuryr_kubernetes/tests/unit/cni/test_binding.py

@@ -12,8 +12,8 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import mock
 import os
+from unittest import mock
 import uuid
 
 

kuryr_kubernetes/tests/unit/cni/test_health.py

@@ -13,10 +13,10 @@
 from ctypes import c_bool
 from kuryr_kubernetes.cni import health
 from kuryr_kubernetes.tests import base
-import mock
 import multiprocessing
 import os
 import tempfile
+from unittest import mock
 
 from oslo_config import cfg
 

kuryr_kubernetes/tests/unit/cni/test_main.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.cni import main
 from kuryr_kubernetes.tests import base as test_base

kuryr_kubernetes/tests/unit/cni/test_service.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from oslo_serialization import jsonutils
 

kuryr_kubernetes/tests/unit/controller/drivers/test_base.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 import abc
+from unittest import mock
 
-import mock
 
 from kuryr_kubernetes.controller.drivers import base as d_base
 from kuryr_kubernetes.tests import base as test_base

kuryr_kubernetes/tests/unit/controller/drivers/test_default_project.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 

kuryr_kubernetes/tests/unit/controller/drivers/test_default_security_groups.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 

kuryr_kubernetes/tests/unit/controller/drivers/test_default_subnet.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 

kuryr_kubernetes/tests/unit/controller/drivers/test_lb_public_ip.py

@@ -12,9 +12,9 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import mock
 import munch
 from openstack import exceptions as os_exc
+from unittest import mock
 
 from kuryr_kubernetes.controller.drivers import lb_public_ip\
     as d_lb_public_ip

kuryr_kubernetes/tests/unit/controller/drivers/test_lbaasv2.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import munch
+from unittest import mock
 
 from openstack import exceptions as os_exc
 from openstack.load_balancer.v2 import listener as o_lis

kuryr_kubernetes/tests/unit/controller/drivers/test_multi_vif.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes import constants
 from kuryr_kubernetes.controller.drivers import base as drivers

kuryr_kubernetes/tests/unit/controller/drivers/test_namespace_subnet.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 import munch
 from openstack import exceptions as os_exc

kuryr_kubernetes/tests/unit/controller/drivers/test_nested_dpdk.py

@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from kuryr_kubernetes.controller.drivers import nested_dpdk_vif
 from kuryr_kubernetes.tests import base as test_base

kuryr_kubernetes/tests/unit/controller/drivers/test_nested_macvlan_vif.py

@@ -10,8 +10,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 import threading
 
 from kuryr.lib import utils as lib_utils

kuryr_kubernetes/tests/unit/controller/drivers/test_nested_vif.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from kuryr.lib import exceptions as kl_exc
 from oslo_config import cfg as oslo_cfg

kuryr_kubernetes/tests/unit/controller/drivers/test_nested_vlan_vif.py

@@ -10,8 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import munch
+from unittest import mock
 
 from kuryr.lib import constants as kl_const
 from kuryr.lib import exceptions as kl_exc

kuryr_kubernetes/tests/unit/controller/drivers/test_network_policy.py

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import munch
 from openstack import exceptions as os_exc
+from unittest import mock
 
 from kuryr_kubernetes.controller.drivers import network_policy
 from kuryr_kubernetes import exceptions

kuryr_kubernetes/tests/unit/controller/drivers/test_network_policy_security_groups.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.controller.drivers import network_policy_security_groups
 from kuryr_kubernetes.tests import base as test_base

kuryr_kubernetes/tests/unit/controller/drivers/test_neutron_vif.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from kuryr.lib import constants as kl_const
 import munch

kuryr_kubernetes/tests/unit/controller/drivers/test_public_ip.py

@@ -12,9 +12,9 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import mock
 import munch
 from openstack import exceptions as os_exc
+from unittest import mock
 
 from kuryr_kubernetes.controller.drivers import public_ip\
     as d_public_ip

kuryr_kubernetes/tests/unit/controller/drivers/test_sriov.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 import uuid
 
 from kuryr_kubernetes.controller.drivers import sriov as drvs

kuryr_kubernetes/tests/unit/controller/drivers/test_utils.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.controller.drivers import utils
 

kuryr_kubernetes/tests/unit/controller/drivers/test_vif_pool.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import collections
-import mock
+from unittest import mock
 import uuid
 
 import ddt

kuryr_kubernetes/tests/unit/controller/handlers/test_kuryrnetwork.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from oslo_config import cfg as oslo_cfg
 

kuryr_kubernetes/tests/unit/controller/handlers/test_kuryrnetwork_population.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.controller.drivers import base as drivers
 from kuryr_kubernetes.controller.drivers import namespace_subnet as subnet_drv

kuryr_kubernetes/tests/unit/controller/handlers/test_lbaas.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 import itertools
-import mock
+from unittest import mock
 import uuid
 
 import os_vif.objects.network as osv_network

kuryr_kubernetes/tests/unit/controller/handlers/test_namespace.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.controller.drivers import base as drivers
 from kuryr_kubernetes.controller.handlers import namespace

kuryr_kubernetes/tests/unit/controller/handlers/test_pipeline.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.controller.handlers import pipeline as h_pipeline
 from kuryr_kubernetes.handlers import dispatch as h_dis

kuryr_kubernetes/tests/unit/controller/handlers/test_pod_label.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes import constants as k_const
 from kuryr_kubernetes.controller.drivers import base as drivers

kuryr_kubernetes/tests/unit/controller/handlers/test_policy.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.controller.drivers import base as drivers
 from kuryr_kubernetes.controller.handlers import policy

kuryr_kubernetes/tests/unit/controller/handlers/test_vif.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from os_vif import objects as os_obj
 

kuryr_kubernetes/tests/unit/controller/managers/test_health.py

@@ -16,7 +16,8 @@ from kuryr_kubernetes.controller.managers import health
 from kuryr_kubernetes.handlers import health as h_health
 from kuryr_kubernetes.tests import base
 from kuryr_kubernetes.tests.unit import kuryr_fixtures as k_fix
-import mock
+from unittest import mock
+
 from oslo_config import cfg as oslo_cfg
 
 

kuryr_kubernetes/tests/unit/controller/managers/test_pool.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import mock
+from unittest import mock
 
 from http.server import BaseHTTPRequestHandler
 

kuryr_kubernetes/tests/unit/controller/test_service.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.controller import service
 from kuryr_kubernetes.tests import base as test_base

kuryr_kubernetes/tests/unit/handlers/test_asynchronous.py

@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import queue
+from unittest import mock
 
 from kuryr_kubernetes.handlers import asynchronous as h_async
 from kuryr_kubernetes.tests import base as test_base

kuryr_kubernetes/tests/unit/handlers/test_dispatch.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.handlers import dispatch as h_dis
 from kuryr_kubernetes.tests import base as test_base

kuryr_kubernetes/tests/unit/handlers/test_health.py

@@ -14,7 +14,7 @@
 
 from kuryr_kubernetes.handlers import health as h_health
 from kuryr_kubernetes.tests import base as test_base
-import mock
+from unittest import mock
 
 
 class _TestHandler(h_health.HealthHandler):

kuryr_kubernetes/tests/unit/handlers/test_k8s_base.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.handlers import k8s_base as h_k8s
 from kuryr_kubernetes.tests import base as test_base

kuryr_kubernetes/tests/unit/handlers/test_logging.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.handlers import logging as h_log
 from kuryr_kubernetes.tests import base as test_base

kuryr_kubernetes/tests/unit/handlers/test_retry.py

@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import fixtures
-import mock
 import time
 
 from kuryr_kubernetes import exceptions

kuryr_kubernetes/tests/unit/kuryr_fixtures.py

@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import fixtures
-import mock
 
 from kuryr_kubernetes import k8s_client
 

kuryr_kubernetes/tests/unit/test_clients.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from kuryr_kubernetes import clients
 from kuryr_kubernetes.tests import base as test_base

kuryr_kubernetes/tests/unit/test_k8s_client.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import itertools
-import mock
 import os
 import tempfile
+from unittest import mock
 
 from oslo_serialization import jsonutils
 import requests

kuryr_kubernetes/tests/unit/test_linux_net_utils.py

@@ -10,7 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from oslo_concurrency import processutils as utils
 
 from kuryr_kubernetes import linux_net_utils as linux_net

kuryr_kubernetes/tests/unit/test_os_vif_plug_noop.py

@@ -10,8 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
 from stevedore import extension
+from unittest import mock
 
 import os_vif
 from os_vif import objects

kuryr_kubernetes/tests/unit/test_os_vif_util.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 import uuid
 
 import munch

kuryr_kubernetes/tests/unit/test_utils.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import mock
+from unittest import mock
 
 import munch
 from openstack import exceptions as os_exc

kuryr_kubernetes/tests/unit/test_watcher.py

@@ -14,7 +14,7 @@
 #    under the License.
 
 from eventlet import greenlet
-import mock
+from unittest import mock
 
 from kuryr_kubernetes.tests import base as test_base
 from kuryr_kubernetes.tests.unit import kuryr_fixtures as kuryr_fixtures

test-requirements.txt

@@ -7,7 +7,6 @@ hacking>=2.0.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 docutils>=0.11 # OSI-Approved Open Source, Public Domain
-mock>=2.0.0 # BSD
 python-subunit>=1.0.0 # Apache-2.0/BSD
 stestr>=1.0.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0