From f6121b5691db3080510b9a3339e604c00e16ab8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Mon, 8 Jun 2020 22:39:15 +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: I7b12f467e329e2693e4c7349f328133a1ec3cb00
---
 .zuul.yaml                                       | 1 -
 test-requirements.txt                            | 5 -----
 unit_tests/__init__.py                           | 2 +-
 unit_tests/test_designate_handlers.py            | 2 +-
 unit_tests/test_designate_utils.py               | 2 +-
 unit_tests/test_lib_charm_openstack_designate.py | 2 +-
 6 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index b3037e9..0eed196 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,4 @@
 - project:
     templates:
-      - python35-charm-jobs
       - openstack-python3-ussuri-jobs
       - openstack-cover-jobs
diff --git a/test-requirements.txt b/test-requirements.txt
index bb1307f..208032f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -28,11 +28,6 @@ oslo.utils<=3.41.0;python_version<'3.6'
 requests>=2.18.4
 charms.reactive
 
-# 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'
-
 nose>=1.3.7
 coverage>=3.6
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
diff --git a/unit_tests/__init__.py b/unit_tests/__init__.py
index 4417b53..4c7f5d3 100644
--- a/unit_tests/__init__.py
+++ b/unit_tests/__init__.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import sys
-import mock
+from unittest import mock
 
 sys.path.append('src')
 sys.path.append('src/lib')
diff --git a/unit_tests/test_designate_handlers.py b/unit_tests/test_designate_handlers.py
index 27535be..1378b7b 100644
--- a/unit_tests/test_designate_handlers.py
+++ b/unit_tests/test_designate_handlers.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 import reactive.designate_handlers as handlers
 
diff --git a/unit_tests/test_designate_utils.py b/unit_tests/test_designate_utils.py
index 720a830..36b14f1 100644
--- a/unit_tests/test_designate_utils.py
+++ b/unit_tests/test_designate_utils.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import unittest
 
 import reactive.designate_utils as dutils
diff --git a/unit_tests/test_lib_charm_openstack_designate.py b/unit_tests/test_lib_charm_openstack_designate.py
index c7a2394..d83330d 100644
--- a/unit_tests/test_lib_charm_openstack_designate.py
+++ b/unit_tests/test_lib_charm_openstack_designate.py
@@ -15,7 +15,7 @@
 import contextlib
 import unittest
 
-import mock
+from unittest import mock
 
 import charm.openstack.designate as designate