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: Ia6c5910a2e37d5f53e194f4cefdf57dae4dde5b2
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
Sean McGinnis 2020-04-18 11:58:46 -05:00
parent b7a5ad13e0
commit c72fd3c32f
No known key found for this signature in database
GPG Key ID: CE7EE4BFAF8D70C8
17 changed files with 20 additions and 17 deletions

@ -12,7 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import mock
from unittest import mock
from oslotest import base
from requests_mock.contrib import fixture

@ -15,8 +15,8 @@
import os
import tempfile
from unittest import mock
import mock
from oslo_serialization import jsonutils
from oslo_utils import uuidutils
from oslotest import base

@ -14,8 +14,8 @@
import base64
import copy
from unittest import mock
import mock
from six.moves.urllib import parse as urlparse
from oslo_utils import uuidutils

@ -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 mistralclient.tests.unit.base_shell_test as base

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import mock
from unittest import mock
from mistralclient.api.v2 import client
from mistralclient.tests.unit import base

@ -16,10 +16,10 @@
import copy
import sys
from unittest import mock
import six
import mock
from oslo_serialization import jsonutils

@ -15,7 +15,8 @@
# under the License.
#
import mock
from unittest import mock
import six
from mistralclient.api.v2 import actions

@ -14,7 +14,7 @@
# under the License.
#
import mock
from unittest import mock
from mistralclient.api.v2 import cron_triggers
from mistralclient.commands.v2 import cron_triggers as cron_triggers_cmd

@ -16,10 +16,10 @@ import copy
import datetime
import os
import tempfile
from unittest import mock
from oslo_serialization import jsonutils
import mock
import yaml
from mistralclient.api.v2 import environments

@ -14,7 +14,7 @@
# under the License.
#
import mock
from unittest import mock
from mistralclient.api.v2 import event_triggers
from mistralclient.commands.v2 import event_triggers as event_triggers_cmd

@ -16,8 +16,8 @@
# under the License.
#
import mock
import pkg_resources as pkg
from unittest import mock
from oslo_serialization import jsonutils

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import mock
from unittest import mock
from mistralclient.api.v2 import members
from mistralclient.commands.v2 import members as member_cmd

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import mock
from unittest import mock
from mistralclient.api.v2 import services
from mistralclient.commands.v2 import services as service_cmd

@ -15,9 +15,10 @@
# under the License.
#
from unittest import mock
from oslo_serialization import jsonutils
import mock
from mistralclient.api.v2.executions import Execution
from mistralclient.api.v2 import tasks

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import mock
from unittest import mock
from mistralclient.api.v2 import workbooks
from mistralclient.commands.v2 import workbooks as workbook_cmd

@ -13,7 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import mock
from unittest import mock
import six
from mistralclient.api.v2 import workflows

@ -4,7 +4,6 @@
coverage>=4.0 # Apache-2.0
hacking>=1.1.0 # Apache-2.0
python-openstackclient>=3.12.0 # Apache-2.0
mock>=2.0.0 # BSD
oslotest>=3.2.0 # Apache-2.0
requests-mock>=1.2.0 # Apache-2.0
tempest>=17.1.0 # Apache-2.0