From 21586be61f07897dba96a8a409966016f0f2a706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Mon, 8 Jun 2020 22:47:29 +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: I33ef862cde41a229864856486e4fed2dcaa52906
---
 .zuul.yaml                  | 1 -
 test-requirements.txt       | 1 -
 unit_tests/test_provides.py | 2 +-
 unit_tests/test_requires.py | 2 +-
 4 files changed, 2 insertions(+), 4 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 0ea7ad6..e373298 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,4 @@
 charms.reactive
 flake8>=2.2.4
-mock>=1.2
 stestr>=2.2.0
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
diff --git a/unit_tests/test_provides.py b/unit_tests/test_provides.py
index bfa54a1..df53eba 100644
--- a/unit_tests/test_provides.py
+++ b/unit_tests/test_provides.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import charms_openstack.test_utils as test_utils
-import mock
+from unittest import mock
 import provides
 
 
diff --git a/unit_tests/test_requires.py b/unit_tests/test_requires.py
index a28f952..98137dd 100644
--- a/unit_tests/test_requires.py
+++ b/unit_tests/test_requires.py
@@ -12,7 +12,7 @@
 
 
 import unittest
-import mock
+from unittest import mock
 
 import requires