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: I07af25792bf55b00092ec9b1d47497e2f422fe6c
This commit is contained in:
parent
775c06f8ff
commit
269a15a8fc
@ -9,7 +9,6 @@
|
|||||||
#
|
#
|
||||||
charm-tools>=2.4.4
|
charm-tools>=2.4.4
|
||||||
requests>=2.18.4
|
requests>=2.18.4
|
||||||
mock>=1.2
|
|
||||||
flake8>=2.2.4,<=2.4.1
|
flake8>=2.2.4,<=2.4.1
|
||||||
stestr>=2.2.0
|
stestr>=2.2.0
|
||||||
coverage>=4.5.2
|
coverage>=4.5.2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import sys
|
import sys
|
||||||
import mock
|
from unittest import mock
|
||||||
from mock import MagicMock
|
from unittest.mock import MagicMock
|
||||||
|
|
||||||
from test_utils import CharmTestCase
|
from test_utils import CharmTestCase
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
from mock import patch
|
from unittest.mock import patch
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from test_utils import (
|
from test_utils import (
|
||||||
|
@ -2,7 +2,7 @@ import io
|
|||||||
|
|
||||||
from contextlib import contextmanager
|
from contextlib import contextmanager
|
||||||
|
|
||||||
from mock import (
|
from unittest.mock import (
|
||||||
MagicMock,
|
MagicMock,
|
||||||
patch
|
patch
|
||||||
)
|
)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
from mock import MagicMock, patch, call
|
from unittest.mock import MagicMock, patch, call
|
||||||
|
|
||||||
# python-apt is not installed as part of test-requirements but is imported by
|
# python-apt is not installed as part of test-requirements but is imported by
|
||||||
# some charmhelpers modules so create a fake import.
|
# some charmhelpers modules so create a fake import.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
from mock import MagicMock, call, patch, ANY
|
from unittest.mock import MagicMock, call, patch, ANY
|
||||||
|
|
||||||
import charmhelpers.core.hookenv as hookenv
|
import charmhelpers.core.hookenv as hookenv
|
||||||
import neutron_utils
|
import neutron_utils
|
||||||
|
@ -4,7 +4,7 @@ import logging
|
|||||||
import unittest
|
import unittest
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
from mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
|
||||||
def load_config():
|
def load_config():
|
||||||
|
Loading…
Reference in New Issue
Block a user