From 6ff8acbd6a1f2249c41d84fcf3308e0dbf4d59eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Tue, 9 Jun 2020 00:00:02 +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: Ie96a81d19be4f14efc7067ddb9c47827f5255ccf
---
 .zuul.yaml                       | 1 -
 test-requirements.txt            | 5 -----
 unit_tests/__init__.py           | 2 +-
 unit_tests/test_actions.py       | 4 ++--
 unit_tests/test_percona_hooks.py | 2 +-
 unit_tests/test_percona_utils.py | 2 +-
 unit_tests/test_utils.py         | 2 +-
 7 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 34184f1..fd189e2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,3 @@
 - project:
     templates:
-      - python35-charm-jobs
       - openstack-python3-ussuri-jobs
diff --git a/test-requirements.txt b/test-requirements.txt
index f853625..0aabe17 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,11 +13,6 @@ setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
 
 requests>=2.18.4
 
-# Newer mock seems to have some syntax which is newer than python3.5 (e.g.
-# f'{something}'
-mock>=1.2,<4.0.0; python_version < '3.6'
-mock>=1.2; python_version >= '3.6'
-
 stestr>=2.2.0
 
 # Dependency of stestr. Workaround for
diff --git a/unit_tests/__init__.py b/unit_tests/__init__.py
index 8a813c1..bd27ae1 100644
--- a/unit_tests/__init__.py
+++ b/unit_tests/__init__.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
 import os
 import sys
 
diff --git a/unit_tests/test_actions.py b/unit_tests/test_actions.py
index c2a0f6b..2b4e44a 100644
--- a/unit_tests/test_actions.py
+++ b/unit_tests/test_actions.py
@@ -1,5 +1,5 @@
-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_percona_hooks.py b/unit_tests/test_percona_hooks.py
index 919a266..fe044ca 100644
--- a/unit_tests/test_percona_hooks.py
+++ b/unit_tests/test_percona_hooks.py
@@ -1,6 +1,6 @@
 import json
 import logging
-import mock
+from unittest import mock
 import os
 import shutil
 import sys
diff --git a/unit_tests/test_percona_utils.py b/unit_tests/test_percona_utils.py
index 7c0971e..46a3306 100644
--- a/unit_tests/test_percona_utils.py
+++ b/unit_tests/test_percona_utils.py
@@ -2,7 +2,7 @@ import collections
 import os
 import tempfile
 
-import mock
+from unittest import mock
 
 from charmhelpers.fetch import SourceConfigError
 
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index 5e6288c..d52fbba 100644
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -7,7 +7,7 @@ import unittest
 import yaml
 
 from contextlib import contextmanager
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 from charmhelpers.core.unitdata import Record