Use unittest.mock instead of third party mock
Now that we no longer support py27, we can use the standard library unittest.mock module instead of the third party mock lib. Change-Id: I5cf252c1a22977d3c87898e723e5001cc87a0d87
This commit is contained in:
parent
ff1a116a59
commit
8a9566864f
|
@ -15,10 +15,10 @@
|
|||
#
|
||||
|
||||
import os
|
||||
import sys
|
||||
from unittest import mock
|
||||
|
||||
import fixtures
|
||||
import mock
|
||||
import sys
|
||||
import testtools
|
||||
|
||||
from heatclient.tests.unit.osc import fakes
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
# under the License.
|
||||
#
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
from heatclient.tests.unit.osc import utils
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
# under the License.
|
||||
#
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
from heatclient.osc.v1 import build_info as osc_build_info
|
||||
from heatclient.tests.unit.osc.v1 import fakes as orchestration_fakes
|
||||
|
|
|
@ -13,8 +13,8 @@
|
|||
# Copyright 2015 IBM Corp.
|
||||
|
||||
import copy
|
||||
from unittest import mock
|
||||
|
||||
import mock
|
||||
import testscenarios
|
||||
|
||||
from heatclient import exc
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
#
|
||||
|
||||
import copy
|
||||
from unittest import mock
|
||||
|
||||
import mock
|
||||
from osc_lib import exceptions as exc
|
||||
|
||||
from heatclient import exc as heat_exc
|
||||
|
|
|
@ -9,8 +9,9 @@
|
|||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
import mock
|
||||
|
||||
from unittest import mock
|
||||
|
||||
from osc_lib import exceptions as exc
|
||||
import six
|
||||
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
# under the License.
|
||||
#
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
from osc_lib import exceptions as exc
|
||||
import yaml
|
||||
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
#
|
||||
|
||||
import copy
|
||||
from unittest import mock
|
||||
|
||||
import mock
|
||||
from osc_lib import exceptions as exc
|
||||
|
||||
from heatclient import exc as heat_exc
|
||||
|
|
|
@ -13,8 +13,8 @@
|
|||
|
||||
import copy
|
||||
import io
|
||||
from unittest import mock
|
||||
|
||||
import mock
|
||||
from osc_lib import exceptions as exc
|
||||
from osc_lib import utils
|
||||
import six
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
import collections
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
from heatclient import exc
|
||||
from heatclient.osc.v1 import stack_failures
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#
|
||||
# Copyright 2015 IBM Corp.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
from heatclient import exc
|
||||
from heatclient.osc.v1 import template
|
||||
|
|
|
@ -13,7 +13,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
from oslo_serialization import jsonutils
|
||||
import testtools
|
||||
|
||||
|
|
|
@ -13,9 +13,9 @@
|
|||
# limitations under the License.
|
||||
|
||||
import socket
|
||||
from unittest import mock
|
||||
|
||||
from keystoneauth1 import adapter
|
||||
import mock
|
||||
from oslo_serialization import jsonutils
|
||||
import six
|
||||
import testtools
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
import six
|
||||
import swiftclient.client
|
||||
import testscenarios
|
||||
|
|
|
@ -10,7 +10,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
import six
|
||||
import testscenarios
|
||||
import testtools
|
||||
|
|
|
@ -10,7 +10,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
import testtools
|
||||
|
||||
from heatclient.common import event_utils
|
||||
|
|
|
@ -12,7 +12,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
import testtools
|
||||
|
||||
from heatclient.common import utils
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
import testtools
|
||||
|
||||
from heatclient.common import utils
|
||||
|
|
|
@ -12,7 +12,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
from six.moves.urllib import parse
|
||||
import testtools
|
||||
|
||||
|
|
|
@ -14,11 +14,11 @@
|
|||
import os
|
||||
import sys
|
||||
import tempfile
|
||||
from unittest import mock
|
||||
import uuid
|
||||
|
||||
import fixtures
|
||||
from keystoneauth1 import fixture as keystone_fixture
|
||||
import mock
|
||||
from oslo_serialization import jsonutils
|
||||
from oslo_utils import encodeutils
|
||||
from requests_mock.contrib import fixture as rm_fixture
|
||||
|
|
|
@ -10,7 +10,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
import testtools
|
||||
|
||||
from heatclient.common import utils
|
||||
|
|
|
@ -10,7 +10,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
import testtools
|
||||
|
||||
from heatclient.common import utils
|
||||
|
|
|
@ -10,7 +10,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
import testscenarios
|
||||
from testscenarios import scenarios as scnrs
|
||||
import testtools
|
||||
|
|
|
@ -10,7 +10,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
import six
|
||||
import testscenarios
|
||||
import testtools
|
||||
|
|
|
@ -13,8 +13,8 @@
|
|||
|
||||
import json
|
||||
import tempfile
|
||||
from unittest import mock
|
||||
|
||||
import mock
|
||||
from oslo_serialization import base64
|
||||
import six
|
||||
from six.moves.urllib import error
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
# under the License.
|
||||
|
||||
import os
|
||||
from unittest import mock
|
||||
|
||||
import mock
|
||||
import testtools
|
||||
|
||||
from heatclient.common import utils
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
import testtools
|
||||
|
||||
from heatclient.common import hook_utils
|
||||
|
|
|
@ -31,7 +31,6 @@ keystoneauth1==3.4.0
|
|||
linecache2==1.0.0
|
||||
MarkupSafe==1.0
|
||||
mccabe==0.2.1
|
||||
mock==2.0.0
|
||||
monotonic==0.6
|
||||
msgpack-python==0.4.0
|
||||
munch==2.1.0
|
||||
|
|
|
@ -7,7 +7,6 @@ hacking>=3.0,<3.1.0 # Apache-2.0
|
|||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||
requests-mock>=1.2.0 # Apache-2.0
|
||||
mock>=2.0.0 # BSD
|
||||
python-openstackclient>=3.12.0 # Apache-2.0
|
||||
stestr>=2.0.0 # Apache-2.0
|
||||
tempest>=17.1.0 # Apache-2.0
|
||||
|
|
Loading…
Reference in New Issue