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

.zuul.yaml

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

osci.yaml

@@ -1,6 +1,6 @@
 - project:
     templates:
-      - charm-unit-jobs
+      - charm-yoga-unit-jobs
     check:
       jobs:
       - charm-build
@@ -54,10 +54,9 @@
     parent: func-target
     dependencies: &lint-jobs
         - osci-lint
-        - tox-py35
         - tox-py36
-        - tox-py37
         - tox-py38
+        - tox-py39
         - charm-build
     vars:
       tox_extra_args: bionic-train-ha-ovn

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

@@ -21,7 +21,7 @@ sys.path.append('src/lib')
 import charms_openstack.test_mocks  # noqa
 charms_openstack.test_mocks.mock_charmhelpers()
 
-import mock
+from unittest import mock
 
 
 class _fake_decorator(object):

unit_tests/test_lib_charm_openstack_api_crud.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import contextlib
-import mock
+from unittest import mock
 import subprocess
 
 import charms_openstack.test_utils as test_utils

unit_tests/test_lib_charm_openstack_octavia.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 charms_openstack.test_utils as test_utils
 

unit_tests/test_octavia_handlers.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import json
-import mock
+from unittest import mock
 
 import charm.openstack.octavia as octavia
 import reactive.octavia_handlers as handlers