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: If1ef6178116ed8f1ce8f0244d72246292cdf52e9
This commit is contained in:
Hervé Beraud 2020-06-08 22:44:46 +02:00 committed by James Page
parent 1bb6e20b34
commit d746757302
3 changed files with 2 additions and 3 deletions

View File

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

View File

@ -2,6 +2,5 @@
flake8
stestr
charms.reactive
mock>=1.2
coverage>=3.6
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack

View File

@ -13,7 +13,7 @@
# limitations under the License.
import json
import mock
from unittest import mock
import requires
from netaddr.core import AddrFormatError