From ecfe23ca66dc33556768cb383cc4d8a3e92198b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Mon, 8 Jun 2020 22:29:48 +0200
Subject: [PATCH] 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.

Note that https://github.com/openstack/charms.openstack is used during tests
and he need `mock`, unfortunatelly it doesn't declare `mock` in its
requirements so it retrieve mock from other charm project (cross dependency).
So we depend on charms.openstack first and when
Ib1ed5b598a52375e29e247db9ab4786df5b6d142 will be merged then CI
will pass without errors.

Depends-On: Ib1ed5b598a52375e29e247db9ab4786df5b6d142
Change-Id: Ibddd954daaf3cd008985ff27cd95dfe649476555
---
 test-requirements.txt               | 1 -
 unit_tests/test_actions.py          | 4 ++--
 unit_tests/test_ceilometer_hooks.py | 2 +-
 unit_tests/test_ceilometer_utils.py | 2 +-
 unit_tests/test_utils.py            | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 7d9c258..2422e28 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,6 @@
 #
 charm-tools>=2.4.4
 requests>=2.18.4
-mock>=1.2
 flake8>=2.2.4,<=2.4.1
 stestr>=2.2.0
 coverage>=4.5.2
diff --git a/unit_tests/test_actions.py b/unit_tests/test_actions.py
index 6f37c83..d921671 100644
--- a/unit_tests/test_actions.py
+++ b/unit_tests/test_actions.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
 
 from test_utils import CharmTestCase
 
diff --git a/unit_tests/test_ceilometer_hooks.py b/unit_tests/test_ceilometer_hooks.py
index 2be6c51..962f686 100644
--- a/unit_tests/test_ceilometer_hooks.py
+++ b/unit_tests/test_ceilometer_hooks.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import json
-from mock import patch
+from unittest.mock import patch
 
 import ceilometer_utils
 
diff --git a/unit_tests/test_ceilometer_utils.py b/unit_tests/test_ceilometer_utils.py
index afa56b8..5707e07 100644
--- a/unit_tests/test_ceilometer_utils.py
+++ b/unit_tests/test_ceilometer_utils.py
@@ -14,7 +14,7 @@
 
 import sys
 
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 # python-apt is not installed as part of test-requirements but is imported by
 # some charmhelpers modules so create a fake import.
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index deb5206..c7dddb4 100644
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -19,7 +19,7 @@ import yaml
 import io
 
 from contextlib import contextmanager
-from mock import patch
+from unittest.mock import patch
 
 
 @contextmanager