openstack/charm-interface-service-control
Code Issues Proposed changes

Use unittest.mock instead of mock

Browse Source 
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: Ic1a687f95e5fd16ffa7f63102d6f8f2de383780e
This commit is contained in:
Hervé Beraud 2020-06-08 22:58:53 +02:00
parent 7896d6766f
commit 714ef09e17
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test-requirements.txt
View File

@ -2,6 +2,5 @@
flake8 flake8
os-testr>=0.4.1 os-testr>=0.4.1
charms.reactive charms.reactive
mock>=1.2
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

2
unit_tests/test_requires.py
View File

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