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: I7b12f467e329e2693e4c7349f328133a1ec3cb00
This commit is contained in:
Hervé Beraud 2020-06-08 22:39:15 +02:00 committed by James Page
parent cdd9a7a4dc
commit f6121b5691
6 changed files with 4 additions and 10 deletions

View File

@ -1,5 +1,4 @@
- project:
templates:
- 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'
requests>=2.18.4
charms.reactive
# 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'
nose>=1.3.7
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 sys
import mock
from unittest import mock
sys.path.append('src')
sys.path.append('src/lib')

View File

@ -1,4 +1,4 @@
import mock
from unittest import mock
import reactive.designate_handlers as handlers

View File

@ -1,4 +1,4 @@
import mock
from unittest import mock
import unittest
import reactive.designate_utils as dutils

View File

@ -15,7 +15,7 @@
import contextlib
import unittest
import mock
from unittest import mock
import charm.openstack.designate as designate