From 240fcc9eca7d4753f9cefcdc2e5714c5354ae02d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Fri, 15 May 2020 18:50:59 +0200
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: Ia552f03378bfa2d6612718eeec02da0448d322bc
---
 lower-constraints.txt                               | 1 -
 tripleo_common/tests/actions/test_ansible.py        | 2 +-
 tripleo_common/tests/actions/test_baremetal.py      | 2 +-
 tripleo_common/tests/actions/test_base.py           | 2 +-
 tripleo_common/tests/actions/test_derive_params.py  | 2 +-
 tripleo_common/tests/actions/test_parameters.py     | 3 ++-
 tripleo_common/tests/actions/test_plan.py           | 3 +--
 tripleo_common/tests/actions/test_scale.py          | 3 ++-
 tripleo_common/tests/actions/test_validations.py    | 2 +-
 tripleo_common/tests/fake_config/fakes.py           | 2 +-
 tripleo_common/tests/image/builder/test_buildah.py  | 3 +--
 tripleo_common/tests/image/test_base.py             | 3 +--
 tripleo_common/tests/image/test_build.py            | 2 +-
 tripleo_common/tests/image/test_image_builder.py    | 3 +--
 tripleo_common/tests/image/test_image_export.py     | 2 +-
 tripleo_common/tests/image/test_image_uploader.py   | 2 +-
 tripleo_common/tests/image/test_kolla_builder.py    | 4 ++--
 tripleo_common/tests/test_arch.py                   | 3 +--
 tripleo_common/tests/test_filters.py                | 3 +--
 tripleo_common/tests/test_inventories.py            | 3 ++-
 tripleo_common/tests/test_inventory.py              | 3 ++-
 tripleo_common/tests/test_update.py                 | 2 +-
 tripleo_common/tests/utils/test_config.py           | 7 ++++---
 tripleo_common/tests/utils/test_glance.py           | 2 +-
 tripleo_common/tests/utils/test_nodes.py            | 2 +-
 tripleo_common/tests/utils/test_overcloudrc.py      | 2 +-
 tripleo_common/tests/utils/test_parameters.py       | 2 +-
 tripleo_common/tests/utils/test_passwords.py        | 2 +-
 tripleo_common/tests/utils/test_plan.py             | 5 +++--
 tripleo_common/tests/utils/test_process.py          | 2 +-
 tripleo_common/tests/utils/test_roles.py            | 3 ++-
 tripleo_common/tests/utils/test_stack.py            | 3 ++-
 tripleo_common/tests/utils/test_stack_parameters.py | 3 ++-
 tripleo_common/tests/utils/test_swift.py            | 2 +-
 tripleo_common/tests/utils/test_template.py         | 3 ++-
 tripleo_common/tests/utils/test_validations.py      | 2 +-
 36 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 673eaf38c..8843cde25 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -35,7 +35,6 @@ MarkupSafe==1.0
 mccabe==0.2.1
 metalsmith==0.13.0
 mistral-lib==0.3.0
-mock==2.0.0
 monotonic==0.6
 mox3==0.20.0
 msgpack-python==0.4.0
diff --git a/tripleo_common/tests/actions/test_ansible.py b/tripleo_common/tests/actions/test_ansible.py
index 87b90d40a..acc23118f 100644
--- a/tripleo_common/tests/actions/test_ansible.py
+++ b/tripleo_common/tests/actions/test_ansible.py
@@ -14,7 +14,6 @@
 # under the License.
 
 import json
-import mock
 import os
 import random
 from six.moves import configparser
@@ -22,6 +21,7 @@ import shutil
 import string
 import sys
 import tempfile
+from unittest import mock
 
 from oslo_concurrency import processutils
 
diff --git a/tripleo_common/tests/actions/test_baremetal.py b/tripleo_common/tests/actions/test_baremetal.py
index 6cc9c2724..a0c0995d6 100644
--- a/tripleo_common/tests/actions/test_baremetal.py
+++ b/tripleo_common/tests/actions/test_baremetal.py
@@ -11,7 +11,7 @@
 # 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 glanceclient import exc as glance_exceptions
 import ironic_inspector_client
diff --git a/tripleo_common/tests/actions/test_base.py b/tripleo_common/tests/actions/test_base.py
index 4e78c1358..a8b625433 100644
--- a/tripleo_common/tests/actions/test_base.py
+++ b/tripleo_common/tests/actions/test_base.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from ironicclient import client as ironicclient
 
diff --git a/tripleo_common/tests/actions/test_derive_params.py b/tripleo_common/tests/actions/test_derive_params.py
index e2d90c56a..08c40e10f 100644
--- a/tripleo_common/tests/actions/test_derive_params.py
+++ b/tripleo_common/tests/actions/test_derive_params.py
@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from mistral_lib import actions
 
diff --git a/tripleo_common/tests/actions/test_parameters.py b/tripleo_common/tests/actions/test_parameters.py
index c0f46c58f..a0518205c 100644
--- a/tripleo_common/tests/actions/test_parameters.py
+++ b/tripleo_common/tests/actions/test_parameters.py
@@ -12,7 +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
+from unittest import mock
+
 import yaml
 
 from swiftclient import exceptions as swiftexceptions
diff --git a/tripleo_common/tests/actions/test_plan.py b/tripleo_common/tests/actions/test_plan.py
index c46c3cb05..cda8f44aa 100644
--- a/tripleo_common/tests/actions/test_plan.py
+++ b/tripleo_common/tests/actions/test_plan.py
@@ -12,8 +12,7 @@
 # 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 heatclient import exc as heatexceptions
 from oslo_concurrency import processutils
diff --git a/tripleo_common/tests/actions/test_scale.py b/tripleo_common/tests/actions/test_scale.py
index d0087103a..600a9910a 100644
--- a/tripleo_common/tests/actions/test_scale.py
+++ b/tripleo_common/tests/actions/test_scale.py
@@ -13,7 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import collections
-import mock
+from unittest import mock
+
 import yaml
 
 from mistral_lib import actions
diff --git a/tripleo_common/tests/actions/test_validations.py b/tripleo_common/tests/actions/test_validations.py
index f89fa758b..2eef339de 100644
--- a/tripleo_common/tests/actions/test_validations.py
+++ b/tripleo_common/tests/actions/test_validations.py
@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import collections
-import mock
+from unittest import mock
 
 from mistral_lib import actions
 from oslo_concurrency.processutils import ProcessExecutionError
diff --git a/tripleo_common/tests/fake_config/fakes.py b/tripleo_common/tests/fake_config/fakes.py
index 4c1a95f20..18f579f08 100644
--- a/tripleo_common/tests/fake_config/fakes.py
+++ b/tripleo_common/tests/fake_config/fakes.py
@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 
 FAKE_STACK = {
diff --git a/tripleo_common/tests/image/builder/test_buildah.py b/tripleo_common/tests/image/builder/test_buildah.py
index f276313e1..f013f354a 100644
--- a/tripleo_common/tests/image/builder/test_buildah.py
+++ b/tripleo_common/tests/image/builder/test_buildah.py
@@ -15,10 +15,9 @@
 """Unit tests for image.builder.buildah"""
 
 import copy
-import mock
-
 from concurrent import futures
 from concurrent.futures import ThreadPoolExecutor as tpe
+from unittest import mock
 
 from tripleo_common.image.builder.buildah import BuildahBuilder as bb
 from tripleo_common.tests import base
diff --git a/tripleo_common/tests/image/test_base.py b/tripleo_common/tests/image/test_base.py
index b73e4ec6c..32440e47b 100644
--- a/tripleo_common/tests/image/test_base.py
+++ b/tripleo_common/tests/image/test_base.py
@@ -13,8 +13,7 @@
 #   under the License.
 #
 
-
-import mock
+from unittest import mock
 
 from tripleo_common.image.base import BaseImageManager
 from tripleo_common.image.exception import ImageSpecificationException
diff --git a/tripleo_common/tests/image/test_build.py b/tripleo_common/tests/image/test_build.py
index 935c3bfb2..aca12cb01 100644
--- a/tripleo_common/tests/image/test_build.py
+++ b/tripleo_common/tests/image/test_build.py
@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from tripleo_common.image.build import ImageBuildManager
 from tripleo_common.image.exception import ImageSpecificationException
diff --git a/tripleo_common/tests/image/test_image_builder.py b/tripleo_common/tests/image/test_image_builder.py
index 0b661fe23..b00be6216 100644
--- a/tripleo_common/tests/image/test_image_builder.py
+++ b/tripleo_common/tests/image/test_image_builder.py
@@ -13,9 +13,8 @@
 #   under the License.
 #
 
-
-import mock
 import subprocess
+from unittest import mock
 
 from tripleo_common.image.exception import ImageBuilderException
 from tripleo_common.image.image_builder import DibImageBuilder
diff --git a/tripleo_common/tests/image/test_image_export.py b/tripleo_common/tests/image/test_image_export.py
index b086bf4e9..d3e689b2b 100644
--- a/tripleo_common/tests/image/test_image_export.py
+++ b/tripleo_common/tests/image/test_image_export.py
@@ -16,13 +16,13 @@
 import hashlib
 import io
 import json
-import mock
 import os
 import requests
 import shutil
 import six
 from six.moves.urllib.parse import urlparse
 import tempfile
+from unittest import mock
 import zlib
 
 from tripleo_common.image import image_export
diff --git a/tripleo_common/tests/image/test_image_uploader.py b/tripleo_common/tests/image/test_image_uploader.py
index 604bfde56..18b4d1e2e 100644
--- a/tripleo_common/tests/image/test_image_uploader.py
+++ b/tripleo_common/tests/image/test_image_uploader.py
@@ -16,7 +16,6 @@
 import hashlib
 import io
 import json
-import mock
 import operator
 import os
 import requests
@@ -24,6 +23,7 @@ from requests_mock.contrib import fixture as rm_fixture
 import six
 from six.moves.urllib.parse import urlparse
 import tempfile
+from unittest import mock
 import zlib
 
 from oslo_concurrency import processutils
diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py
index 8f0de13cb..19adfa47c 100644
--- a/tripleo_common/tests/image/test_kolla_builder.py
+++ b/tripleo_common/tests/image/test_kolla_builder.py
@@ -13,12 +13,12 @@
 #   under the License.
 #
 
-
-import mock
 import os
 import six
 import sys
 import tempfile
+from unittest import mock
+
 import yaml
 
 from tripleo_common import constants
diff --git a/tripleo_common/tests/test_arch.py b/tripleo_common/tests/test_arch.py
index ec330421c..c7a5f398f 100644
--- a/tripleo_common/tests/test_arch.py
+++ b/tripleo_common/tests/test_arch.py
@@ -19,8 +19,7 @@
 Test cases for tripleo_common.arch module.
 """
 
-import mock
-
+from unittest import mock
 from unittest import TestCase
 
 from tripleo_common import arch
diff --git a/tripleo_common/tests/test_filters.py b/tripleo_common/tests/test_filters.py
index a935e939b..203e9d172 100644
--- a/tripleo_common/tests/test_filters.py
+++ b/tripleo_common/tests/test_filters.py
@@ -14,8 +14,7 @@
 # limitations under the License.
 
 import sys
-
-import mock
+from unittest import mock
 
 from tripleo_common.tests import base
 from tripleo_common.tests import fake_nova
diff --git a/tripleo_common/tests/test_inventories.py b/tripleo_common/tests/test_inventories.py
index e619382fa..15cc5aa5d 100644
--- a/tripleo_common/tests/test_inventories.py
+++ b/tripleo_common/tests/test_inventories.py
@@ -14,9 +14,10 @@
 
 import fixtures
 import os
+from unittest.mock import MagicMock
+
 import yaml
 
-from mock import MagicMock
 from tripleo_common.tests import base
 from tripleo_common.inventories import TripleoInventories
 
diff --git a/tripleo_common/tests/test_inventory.py b/tripleo_common/tests/test_inventory.py
index b37045ca3..0ea382aec 100644
--- a/tripleo_common/tests/test_inventory.py
+++ b/tripleo_common/tests/test_inventory.py
@@ -15,10 +15,11 @@
 import fixtures
 import os
 import sys
+from unittest.mock import MagicMock
+
 import yaml
 
 from heatclient.exc import HTTPNotFound
-from mock import MagicMock
 
 from tripleo_common.inventory import StackOutputs
 from tripleo_common.inventory import TripleoInventory
diff --git a/tripleo_common/tests/test_update.py b/tripleo_common/tests/test_update.py
index bfd40e814..12e8e19bf 100644
--- a/tripleo_common/tests/test_update.py
+++ b/tripleo_common/tests/test_update.py
@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from tripleo_common.tests import base
 from tripleo_common import update
diff --git a/tripleo_common/tests/utils/test_config.py b/tripleo_common/tests/utils/test_config.py
index 2021607a1..c5bd49b58 100644
--- a/tripleo_common/tests/utils/test_config.py
+++ b/tripleo_common/tests/utils/test_config.py
@@ -12,14 +12,15 @@
 
 import datetime
 import fixtures
-import mock
 import os
+from unittest import mock
+from unittest.mock import patch
+from unittest.mock import call
 import uuid
 import warnings
+
 import yaml
 
-from mock import call
-from mock import patch
 
 from tripleo_common import constants
 from tripleo_common.tests import base
diff --git a/tripleo_common/tests/utils/test_glance.py b/tripleo_common/tests/utils/test_glance.py
index 0979f7acc..5eca17efa 100644
--- a/tripleo_common/tests/utils/test_glance.py
+++ b/tripleo_common/tests/utils/test_glance.py
@@ -14,9 +14,9 @@
 # limitations under the License.
 
 import collections
+from unittest import mock
 
 from glanceclient import exc as exceptions
-import mock
 import testtools
 
 from tripleo_common.tests import base
diff --git a/tripleo_common/tests/utils/test_nodes.py b/tripleo_common/tests/utils/test_nodes.py
index 32756c39a..111a31b18 100644
--- a/tripleo_common/tests/utils/test_nodes.py
+++ b/tripleo_common/tests/utils/test_nodes.py
@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import collections
+from unittest import mock
 
-import mock
 from testtools import matchers
 
 from tripleo_common import exception
diff --git a/tripleo_common/tests/utils/test_overcloudrc.py b/tripleo_common/tests/utils/test_overcloudrc.py
index 25cebea17..2862ae473 100644
--- a/tripleo_common/tests/utils/test_overcloudrc.py
+++ b/tripleo_common/tests/utils/test_overcloudrc.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from heatclient import exc as heat_exc
 import six
diff --git a/tripleo_common/tests/utils/test_parameters.py b/tripleo_common/tests/utils/test_parameters.py
index 8d8395cb7..e65aa7a87 100644
--- a/tripleo_common/tests/utils/test_parameters.py
+++ b/tripleo_common/tests/utils/test_parameters.py
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from tripleo_common import exception
 from tripleo_common.tests import base
diff --git a/tripleo_common/tests/utils/test_passwords.py b/tripleo_common/tests/utils/test_passwords.py
index 9432c6cb9..df4b00e25 100644
--- a/tripleo_common/tests/utils/test_passwords.py
+++ b/tripleo_common/tests/utils/test_passwords.py
@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import sys
-import mock
+from unittest import mock
 
 from oslo_utils import uuidutils
 
diff --git a/tripleo_common/tests/utils/test_plan.py b/tripleo_common/tests/utils/test_plan.py
index 2f0f45d08..0aeec6463 100644
--- a/tripleo_common/tests/utils/test_plan.py
+++ b/tripleo_common/tests/utils/test_plan.py
@@ -14,12 +14,13 @@
 # limitations under the License.
 
 import json
-import mock
 import os
 import sys
-import yaml
+from unittest import mock
 import zlib
 
+import yaml
+
 import six
 from swiftclient import exceptions as swiftexceptions
 
diff --git a/tripleo_common/tests/utils/test_process.py b/tripleo_common/tests/utils/test_process.py
index e9a66d4da..71c853568 100644
--- a/tripleo_common/tests/utils/test_process.py
+++ b/tripleo_common/tests/utils/test_process.py
@@ -17,8 +17,8 @@
 
 
 import os
+from unittest import mock
 
-import mock
 from oslo_concurrency import processutils
 
 from tripleo_common.tests import base
diff --git a/tripleo_common/tests/utils/test_roles.py b/tripleo_common/tests/utils/test_roles.py
index f5546bb12..1e4b5dd6c 100644
--- a/tripleo_common/tests/utils/test_roles.py
+++ b/tripleo_common/tests/utils/test_roles.py
@@ -13,7 +13,8 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
+
 import yaml
 
 import six
diff --git a/tripleo_common/tests/utils/test_stack.py b/tripleo_common/tests/utils/test_stack.py
index a1a21a152..3ec126f2f 100644
--- a/tripleo_common/tests/utils/test_stack.py
+++ b/tripleo_common/tests/utils/test_stack.py
@@ -13,10 +13,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import tempfile
+from unittest import mock
+
 import yaml
 
 from heatclient import exc as heat_exc
-import mock
 from swiftclient import exceptions as swiftexceptions
 
 from tripleo_common import constants
diff --git a/tripleo_common/tests/utils/test_stack_parameters.py b/tripleo_common/tests/utils/test_stack_parameters.py
index e3ac0cdec..4befaee2d 100644
--- a/tripleo_common/tests/utils/test_stack_parameters.py
+++ b/tripleo_common/tests/utils/test_stack_parameters.py
@@ -11,9 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
+
 import yaml
 
-import mock
 from swiftclient import exceptions as swiftexceptions
 
 from tripleo_common import constants
diff --git a/tripleo_common/tests/utils/test_swift.py b/tripleo_common/tests/utils/test_swift.py
index f105facd0..8cf5b13e1 100644
--- a/tripleo_common/tests/utils/test_swift.py
+++ b/tripleo_common/tests/utils/test_swift.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from tripleo_common.tests import base
 from tripleo_common.utils import swift as swift_utils
diff --git a/tripleo_common/tests/utils/test_template.py b/tripleo_common/tests/utils/test_template.py
index d9896c443..6a688d39e 100644
--- a/tripleo_common/tests/utils/test_template.py
+++ b/tripleo_common/tests/utils/test_template.py
@@ -12,8 +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.
+from unittest import mock
+
 import jinja2
-import mock
 import yaml
 
 from heatclient import exc as heat_exc
diff --git a/tripleo_common/tests/utils/test_validations.py b/tripleo_common/tests/utils/test_validations.py
index 92a95418f..33ac66857 100644
--- a/tripleo_common/tests/utils/test_validations.py
+++ b/tripleo_common/tests/utils/test_validations.py
@@ -12,9 +12,9 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from unittest import mock
 
 from collections import namedtuple
-import mock
 import yaml
 
 from tripleo_common.constants import PLAN_NAME_PATTERN