From 7cd8f7c31a33cb80c50b598fa7c45996f08d5afa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Mon, 8 Jun 2020 22:33:10 +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: I33cd69aca44f48af2766c92ede46ff12367160c5
---
 .zuul.yaml                    | 1 -
 test-requirements.txt         | 6 ------
 unit_tests/test_ceph.py       | 2 +-
 unit_tests/test_ceph_hooks.py | 2 +-
 unit_tests/test_utils.py      | 2 +-
 5 files changed, 3 insertions(+), 10 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..0d12fc2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,12 +12,6 @@ cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 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/test_ceph.py b/unit_tests/test_ceph.py
index bd8d709..211c61b 100644
--- a/unit_tests/test_ceph.py
+++ b/unit_tests/test_ceph.py
@@ -2,7 +2,7 @@ import collections
 import subprocess
 import unittest
 
-import mock
+from unittest import mock
 
 import ceph
 
diff --git a/unit_tests/test_ceph_hooks.py b/unit_tests/test_ceph_hooks.py
index 63dccdb..2af966a 100644
--- a/unit_tests/test_ceph_hooks.py
+++ b/unit_tests/test_ceph_hooks.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import sys
 
 # python-apt is not installed as part of test-requirements but is imported by
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index ed0e7a1..372b2d8 100644
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -4,7 +4,7 @@ import os
 import yaml
 
 from contextlib import contextmanager
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 
 def load_config():