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: I1d7de2bd4d704ffc331fdeacea725e903890f296

.zuul.yaml

@@ -1,5 +1,4 @@
 - project:
     templates:
-      - python35-charm-jobs
       - openstack-python3-ussuri-jobs
       - openstack-cover-jobs

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

unit_tests/__init__.py

@@ -1,6 +1,6 @@
 # unit tests
 
-import mock
+from unittest import mock
 import sys
 
 sys.path.append('src')

unit_tests/test_lib_charm_vault.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 from unittest.mock import patch
 
 import lib.charm.vault as vault

unit_tests/test_lib_charm_vault_pki.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 from unittest.mock import patch
 
 import hvac

unit_tests/test_reactive_vault_handlers.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 from unittest.mock import patch, call
 
 import charms.reactive

unit_tests/test_utils.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import unittest