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 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: I821bf39f976be059f6e7e03b337d6f323787dcb0
This commit is contained in:
Hervé Beraud 2020-06-08 23:03:41 +02:00 committed by James Page
parent 464bbb7d59
commit ff9280d24d
3 changed files with 1 additions and 7 deletions

View File

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

View File

@ -28,11 +28,6 @@ oslo.utils<=3.41.0;python_version<'3.6'
# 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'

View File

@ -15,7 +15,7 @@
from __future__ import absolute_import
from __future__ import print_function
import mock
from unittest import mock
import reactive.nova_cell_controller_handlers as handlers