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: If352ea32d18cd3d1d8bc5577a32c0397e1cb7e93
This commit is contained in:
Hervé Beraud 2020-06-08 22:34:09 +02:00 committed by James Page
parent 6dd6144f66
commit c817ef666b
9 changed files with 8 additions and 14 deletions

View File

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

View File

@ -13,11 +13,6 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
requests>=2.18.4
# 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'
stestr>=2.2.0
# Dependency of stestr. Workaround for

View File

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

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from mock import patch, call
from unittest.mock import patch, call
import ceph_rgw as ceph # noqa
import utils # noqa

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from mock import patch
from unittest.mock import patch
import ceph_radosgw_context as context
import charmhelpers.contrib.storage.linux.ceph as ceph

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from mock import (
from unittest.mock import (
patch,
MagicMock,
)

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from mock import (
from unittest.mock import (
patch, call, MagicMock, ANY
)

View File

@ -14,7 +14,7 @@
import inspect
import os
import mock
from unittest import mock
import multisite

View File

@ -17,7 +17,7 @@ import os
import unittest
import yaml
from mock import patch
from unittest.mock import patch
def load_config():