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: I8eedfa05c07067bb9a0d3a331d1868210534d84c
This commit is contained in:
Hervé Beraud 2020-06-08 23:03:24 +02:00 committed by James Page
parent 2a6cba8e6f
commit 9951beeff2
9 changed files with 8 additions and 14 deletions

View File

@ -1,5 +1,4 @@
- project:
templates:
- python35-charm-jobs
- openstack-python3-ussuri-jobs
- openstack-cover-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

@ -14,7 +14,7 @@
from test_utils import CharmTestCase
from test_utils import patch_open
from mock import patch
from unittest.mock import patch
import neutron_ovs_context as context
import charmhelpers

View File

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

View File

@ -15,7 +15,7 @@
import hashlib
import subprocess
from mock import MagicMock, patch, call, ANY
from unittest.mock import MagicMock, patch, call, ANY
from collections import OrderedDict
import charmhelpers.contrib.openstack.templating as templating

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

@ -21,7 +21,7 @@ from test_pci_helper import (
mocked_islink,
mocked_realpath,
)
from mock import patch, MagicMock
from unittest.mock import patch, MagicMock
import pci
TO_PATCH = [

View File

@ -16,7 +16,7 @@
import pci
from test_utils import patch_open
from mock import patch, MagicMock
from unittest.mock import patch, MagicMock
import pci_responses
import os

View File

@ -19,7 +19,7 @@ import os
import yaml
from contextlib import contextmanager
from mock import patch, MagicMock
from unittest.mock import patch, MagicMock
def load_config():