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: I631d32e1a330bcd17b53ee873833e8434023958f
This commit is contained in:
Hervé Beraud 2020-06-08 22:43:20 +02:00 committed by James Page
parent 6b03399205
commit e195794f39
7 changed files with 6 additions and 11 deletions

View File

@ -1,4 +1,4 @@
- project:
templates:
- openstack-python3-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

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import json
import mock
import unittest.mock as mock
import subprocess
import sys

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 shutil
import sys

View File

@ -14,7 +14,7 @@
import contextlib
import json
import mock
from unittest import mock
import os
import re
import shutil

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 pcmk
import os
import tempfile

View File

@ -20,8 +20,8 @@ import sys
import yaml
from contextlib import contextmanager
from mock import patch, MagicMock
from charmhelpers.core.unitdata import Record
from unittest.mock import patch, MagicMock
def load_config():