Use unittest.mock instead of PyPI mock
Now that py2 is gone, oslotest dropped dependency on mock and will soon affect Ussuri CI [1], let's use unittest.mock built in py3. This also fixes py38 jobs and proactively prevents py36 and py37 failing due to [1]. This is because we never included mock in test-requirements (but in lower-constraints where it does not really belong at all) and instead relied on oslotest to bring it in. [1] https://review.opendev.org/716322 Change-Id: Iceedcc7ad0d087414f6f94dfc0235fda4754be63
This commit is contained in:
parent
69f7455467
commit
924e7a40f1
|
@ -11,9 +11,9 @@
|
|||
# limitations under the License.
|
||||
|
||||
import os
|
||||
from unittest import mock
|
||||
|
||||
import fixtures
|
||||
import mock
|
||||
from oslo_config import cfg
|
||||
from oslotest import base as oslotest_base
|
||||
|
||||
|
|
|
@ -12,10 +12,10 @@
|
|||
|
||||
import fixtures
|
||||
import itertools
|
||||
import mock
|
||||
import os
|
||||
import requests
|
||||
import sys
|
||||
from unittest import mock
|
||||
|
||||
from kolla.cmd import build as build_cmd
|
||||
from kolla import exception
|
||||
|
|
|
@ -37,7 +37,6 @@ keystoneauth1==3.4.0
|
|||
linecache2==1.0.0
|
||||
MarkupSafe==1.0
|
||||
mccabe==0.2.1
|
||||
mock==2.0.0
|
||||
monotonic==1.4
|
||||
mox3==0.25.0
|
||||
msgpack==0.5.6
|
||||
|
|
|
@ -13,8 +13,8 @@
|
|||
import multiprocessing
|
||||
import os
|
||||
import sys
|
||||
from unittest.mock import patch
|
||||
|
||||
from mock import patch
|
||||
from oslo_log import fixture as log_fixture
|
||||
from oslo_log import log as logging
|
||||
from oslotest import base
|
||||
|
|
|
@ -13,9 +13,9 @@
|
|||
import copy
|
||||
import imp
|
||||
import json
|
||||
import mock
|
||||
import os.path
|
||||
import sys
|
||||
from unittest import mock
|
||||
|
||||
from oslotest import base
|
||||
|
||||
|
|
Loading…
Reference in New Issue