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

.zuul.yaml

@@ -1,5 +1,4 @@
 - project:
     templates:
-      - python35-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

@@ -14,7 +14,7 @@
 
 import os
 
-import mock
+from unittest import mock
 
 from test_utils import CharmTestCase
 

unit_tests/test_actions_openstack_upgrade.py

@@ -15,7 +15,7 @@
 import os
 import sys
 
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 os.environ['JUJU_UNIT_NAME'] = 'glance'
 

unit_tests/test_glance_contexts.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 import glance_contexts as contexts
 from test_utils import (

unit_tests/test_glance_relations.py

@@ -16,7 +16,7 @@ import importlib
 import os
 import sys
 
-from mock import call, patch, MagicMock
+from unittest.mock import call, patch, MagicMock
 from test_utils import CharmTestCase
 
 # python-apt is not installed as part of test-requirements but is imported by

unit_tests/test_glance_utils.py

@@ -15,7 +15,7 @@
 import os
 
 from collections import OrderedDict
-from mock import patch, call, MagicMock, mock_open
+from unittest.mock import patch, call, MagicMock, mock_open
 
 os.environ['JUJU_UNIT_NAME'] = 'glance'
 import glance_utils as utils

unit_tests/test_utils.py

@@ -19,7 +19,7 @@ import unittest
 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()