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

.zuul.yaml

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

test-requirements.txt

@@ -13,11 +13,6 @@ setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
 
 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

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
 from functools import wraps
 
 import json

unit_tests/test_rabbit_utils.py

@@ -15,7 +15,7 @@
 import collections
 from functools import wraps
 import json
-import mock
+from unittest import mock
 import os
 import sys
 import tempfile
@@ -1443,13 +1443,8 @@ class UtilsTests(CharmTestCase):
         for mode, policy in expected_policy.items():
             rabbit_utils.set_ha_mode('test_vhost', mode,
                                      params=policy.get('ha-params'))
-
-            mock_set_policy.assert_called_once()
-
-            self.assertEqual(mock_set_policy.call_args.args[0:3],
-                             ('test_vhost', 'HA', r'^(?!amq\.).*',))
-
-            generated_policy = json.loads(mock_set_policy.call_args.args[3])
-            self.assertEqual(generated_policy, policy)
-
+            mock_set_policy.assert_called_once_with(
+                'test_vhost', 'HA', r'^(?!amq\.).*',
+                json.dumps(policy, sort_keys=True)
+            )
             mock_set_policy.reset_mock()

unit_tests/test_rabbitmq_context.py

@@ -14,7 +14,7 @@
 
 import rabbitmq_context
 
-import mock
+from unittest import mock
 import unittest
 import tempfile
 

unit_tests/test_rabbitmq_server_relations.py

@@ -19,7 +19,7 @@ import sys
 import tempfile
 
 from unit_tests.test_utils import CharmTestCase
-from mock import patch, MagicMock, call
+from unittest.mock import patch, MagicMock, call
 
 from charmhelpers.core.unitdata import Storage
 

unit_tests/test_ssl_utils.py

@@ -14,7 +14,7 @@
 
 
 from unit_tests.test_utils import CharmTestCase
-from mock import patch
+from unittest.mock import patch
 
 import ssl_utils
 

unit_tests/test_utils.py

@@ -19,7 +19,7 @@ import os
 import yaml
 
 from contextlib import contextmanager
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 patch('charmhelpers.contrib.openstack.utils.set_os_workload_status').start()
 patch('charmhelpers.core.hookenv.status_set').start()