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

.zuul.yaml

@@ -1,4 +1,3 @@
 - project:
     templates:
-      - python35-charm-jobs
+      - openstack-python3-ussuri-jobs
-      - openstack-python3-train-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

@@ -25,7 +25,7 @@ sys.path.append('src/actions')
 import charms_openstack.test_mocks  # noqa
 charms_openstack.test_mocks.mock_charmhelpers()
 
-import mock
+from unittest import mock
 import charms
 keystoneauth1 = mock.MagicMock()
 sys.modules['keystoneauth1'] = keystoneauth1

unit_tests/test_actions.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_keystone_saml_mellon_handlers.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 charm.openstack.keystone_saml_mellon as keystone_saml_mellon
 import reactive.keystone_saml_mellon_handlers as handlers

unit_tests/test_lib_charm_openstack_keystone_saml_mellon.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import urllib.error
+from unittest import mock
 
 import charms_openstack.test_utils as test_utils