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: Ie62d7878f7b952f35ca854cc36ee55b62af5f8c1
This commit is contained in:
Hervé Beraud 2020-06-08 22:39:44 +02:00 committed by James Page
parent 7a0fbd1634
commit 41d36e8b2e
5 changed files with 4 additions and 9 deletions

View File

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

View File

@ -28,11 +28,6 @@ oslo.utils<=3.41.0;python_version<'3.6'
requests>=2.18.4 requests>=2.18.4
charms.reactive 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 nose>=1.3.7
coverage>=3.6 coverage>=3.6
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack

View File

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
import sys import sys
import mock from unittest import mock
sys.path.append('src') sys.path.append('src')
sys.path.append('src/lib') sys.path.append('src/lib')

View File

@ -14,7 +14,7 @@
import unittest import unittest
import mock from unittest import mock
import reactive.designate_bind_handlers as handlers import reactive.designate_bind_handlers as handlers

View File

@ -12,7 +12,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import mock
from unittest import mock
import charms_openstack.test_utils as test_utils import charms_openstack.test_utils as test_utils