From 0f47555b38569e847eee8c7bfad57d9b4034e244 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 18 Apr 2020 11:53:47 -0500 Subject: [PATCH] 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: Ibe31e2d17b8baf88c40e00e3beaa019b13594c7c Signed-off-by: Sean McGinnis --- kuryr/tests/unit/binding/drivers/test_hw_veb.py | 3 ++- kuryr/tests/unit/binding/drivers/test_ipvlan.py | 3 ++- kuryr/tests/unit/binding/drivers/test_macvlan.py | 3 ++- kuryr/tests/unit/binding/drivers/test_nested.py | 3 ++- kuryr/tests/unit/binding/drivers/test_utils.py | 3 ++- kuryr/tests/unit/binding/drivers/test_veth.py | 3 ++- kuryr/tests/unit/binding/drivers/test_vlan.py | 3 ++- kuryr/tests/unit/segmentation_type_drivers/test_vlan.py | 2 +- kuryr/tests/unit/test_opts.py | 2 +- kuryr/tests/unit/test_utils.py | 3 ++- 10 files changed, 18 insertions(+), 10 deletions(-) diff --git a/kuryr/tests/unit/binding/drivers/test_hw_veb.py b/kuryr/tests/unit/binding/drivers/test_hw_veb.py index 447d204a..48256095 100644 --- a/kuryr/tests/unit/binding/drivers/test_hw_veb.py +++ b/kuryr/tests/unit/binding/drivers/test_hw_veb.py @@ -11,7 +11,8 @@ # under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from kuryr.lib.binding.drivers import hw_veb diff --git a/kuryr/tests/unit/binding/drivers/test_ipvlan.py b/kuryr/tests/unit/binding/drivers/test_ipvlan.py index 1754ff97..b611d479 100644 --- a/kuryr/tests/unit/binding/drivers/test_ipvlan.py +++ b/kuryr/tests/unit/binding/drivers/test_ipvlan.py @@ -11,7 +11,8 @@ # under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from kuryr.lib.binding.drivers import ipvlan diff --git a/kuryr/tests/unit/binding/drivers/test_macvlan.py b/kuryr/tests/unit/binding/drivers/test_macvlan.py index 20012ddf..92126802 100644 --- a/kuryr/tests/unit/binding/drivers/test_macvlan.py +++ b/kuryr/tests/unit/binding/drivers/test_macvlan.py @@ -11,7 +11,8 @@ # under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from kuryr.lib.binding.drivers import macvlan diff --git a/kuryr/tests/unit/binding/drivers/test_nested.py b/kuryr/tests/unit/binding/drivers/test_nested.py index bdd3b823..c2298ea8 100644 --- a/kuryr/tests/unit/binding/drivers/test_nested.py +++ b/kuryr/tests/unit/binding/drivers/test_nested.py @@ -11,7 +11,8 @@ # under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from kuryr.lib.binding.drivers import nested diff --git a/kuryr/tests/unit/binding/drivers/test_utils.py b/kuryr/tests/unit/binding/drivers/test_utils.py index 96abfbc8..ce0622ed 100644 --- a/kuryr/tests/unit/binding/drivers/test_utils.py +++ b/kuryr/tests/unit/binding/drivers/test_utils.py @@ -9,8 +9,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. +from unittest import mock + import ddt -import mock from oslo_utils import uuidutils import pyroute2.ipdb.interfaces diff --git a/kuryr/tests/unit/binding/drivers/test_veth.py b/kuryr/tests/unit/binding/drivers/test_veth.py index 77ef64ed..79583c0d 100644 --- a/kuryr/tests/unit/binding/drivers/test_veth.py +++ b/kuryr/tests/unit/binding/drivers/test_veth.py @@ -11,7 +11,8 @@ # under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from kuryr.lib.binding.drivers import veth diff --git a/kuryr/tests/unit/binding/drivers/test_vlan.py b/kuryr/tests/unit/binding/drivers/test_vlan.py index 8e8083d0..ca2320ba 100644 --- a/kuryr/tests/unit/binding/drivers/test_vlan.py +++ b/kuryr/tests/unit/binding/drivers/test_vlan.py @@ -11,7 +11,8 @@ # under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from kuryr.lib.binding.drivers import vlan diff --git a/kuryr/tests/unit/segmentation_type_drivers/test_vlan.py b/kuryr/tests/unit/segmentation_type_drivers/test_vlan.py index 47f7fdff..904cda82 100644 --- a/kuryr/tests/unit/segmentation_type_drivers/test_vlan.py +++ b/kuryr/tests/unit/segmentation_type_drivers/test_vlan.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 from six import moves diff --git a/kuryr/tests/unit/test_opts.py b/kuryr/tests/unit/test_opts.py index 5291622c..c7125a37 100644 --- a/kuryr/tests/unit/test_opts.py +++ b/kuryr/tests/unit/test_opts.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 opts as kuryr_opts from kuryr.tests.unit import base diff --git a/kuryr/tests/unit/test_utils.py b/kuryr/tests/unit/test_utils.py index c44ac6ce..fdc0605b 100644 --- a/kuryr/tests/unit/test_utils.py +++ b/kuryr/tests/unit/test_utils.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 socket from oslo_config import cfg