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: I0417bae3d6311c9dcee53ef974ed49270adb4fc1
This commit is contained in:
parent
ac03d84490
commit
ed42763698
@ -1,5 +1,4 @@
|
||||
- project:
|
||||
templates:
|
||||
- python35-charm-jobs
|
||||
- openstack-python3-ussuri-jobs
|
||||
- openstack-cover-jobs
|
||||
|
@ -14,8 +14,9 @@
|
||||
|
||||
import unittest
|
||||
|
||||
import mock
|
||||
import charms_openstack.test_utils as test_utils
|
||||
from unittest import mock
|
||||
|
||||
import reactive.aodh_handlers as handlers
|
||||
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
import charm.openstack.aodh as aodh
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user