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: I69e03a14ab370bd6870e4325627e7be86fe2a53f
This commit is contained in:
Hervé Beraud 2020-06-08 22:47:45 +02:00 committed by James Page
parent 06675c43c9
commit f90f8c6edc
4 changed files with 2 additions and 4 deletions

View File

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

View File

@ -1,5 +1,4 @@
charms.reactive
flake8>=2.2.4
mock>=1.2
stestr>=2.2.0
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack

View File

@ -13,7 +13,7 @@
# limitations under the License.
import charms_openstack.test_utils as test_utils
import mock
from unittest import mock
import provides

View File

@ -12,7 +12,7 @@
import unittest
import mock
from unittest import mock
import requires