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: Ie96a81d19be4f14efc7067ddb9c47827f5255ccf
This commit is contained in:
Hervé Beraud 2020-06-09 00:00:02 +02:00 committed by James Page
parent 50f3f31f47
commit 6ff8acbd6a
7 changed files with 6 additions and 12 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,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import mock
from unittest import mock
import os
import sys

View File

@ -1,5 +1,5 @@
import mock
from mock import patch
from unittest import mock
from unittest.mock import patch
from test_utils import CharmTestCase

View File

@ -1,6 +1,6 @@
import json
import logging
import mock
from unittest import mock
import os
import shutil
import sys

View File

@ -2,7 +2,7 @@ import collections
import os
import tempfile
import mock
from unittest import mock
from charmhelpers.fetch import SourceConfigError

View File

@ -7,7 +7,7 @@ import unittest
import yaml
from contextlib import contextmanager
from mock import patch, MagicMock
from unittest.mock import patch, MagicMock
from charmhelpers.core.unitdata import Record