Merge "Use unittest.mock instead of mock"

.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