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: I6a4524c3e0458747646995615535e85cde2e155f
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>

mistral/tests/unit/actions/test_javascript_action.py

@@ -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 mistral.actions import std_actions as std
 from mistral.tests.unit import base

mistral/tests/unit/actions/test_std_echo_action.py

@@ -14,7 +14,7 @@
 
 from mistral.actions import std_actions as std
 from mistral.tests.unit import base
-import mock
+from unittest import mock
 
 
 class EchoActionTest(base.BaseTest):

mistral/tests/unit/actions/test_std_email_action.py

@@ -17,7 +17,8 @@
 import base64
 from email.header import decode_header
 from email import parser
-import mock
+from unittest import mock
+
 import six
 import testtools
 

mistral/tests/unit/actions/test_std_fail_action.py

@@ -11,7 +11,7 @@
 #    WITHOUT 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 mistral.actions import std_actions as std
 from mistral import exceptions as exc

mistral/tests/unit/actions/test_std_http_action.py

@@ -13,8 +13,8 @@
 #    limitations under the License.
 
 import json
+from unittest import mock
 
-import mock
 import requests
 
 from mistral.actions import std_actions as std

mistral/tests/unit/actions/test_std_mistral_http_action.py

@@ -11,8 +11,8 @@
 #    limitations under the License.
 
 import json
+from unittest import mock
 
-import mock
 import requests
 
 from mistral.actions import std_actions as std

mistral/tests/unit/actions/test_std_ssh_action.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 import json
-import mock
+from unittest import mock
 
 from mistral.actions import std_actions as std
 from mistral import exceptions as exc

mistral/tests/unit/actions/test_std_test_dict_action.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from mistral.actions import std_actions as std
 from mistral.tests.unit import base

mistral/tests/unit/api/base.py

@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import mock
 import pecan
 import pecan.testing
+from unittest import mock
 from webtest import app as webtest_app
 
 from mistral.api import app as pecan_app

mistral/tests/unit/api/test_service.py

@@ -12,7 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from oslo_concurrency import processutils
 from oslo_config import cfg
 

mistral/tests/unit/api/v2/test_action_executions.py

@@ -16,8 +16,8 @@
 import copy
 import datetime
 import json
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 import oslo_messaging
 from oslo_messaging import exceptions as oslo_exc

mistral/tests/unit/api/v2/test_actions.py

@@ -13,8 +13,8 @@
 #    limitations under the License.
 
 import copy
+from unittest import mock
 
-import mock
 import sqlalchemy as sa
 
 from mistral.db.v2 import api as db_api

mistral/tests/unit/api/v2/test_cron_triggers.py

@@ -14,8 +14,8 @@
 
 import copy
 import json
+from unittest import mock
 
-import mock
 import sqlalchemy as sa
 
 from mistral.db.v2 import api as db_api

mistral/tests/unit/api/v2/test_environment.py

@@ -15,8 +15,8 @@
 import copy
 import datetime
 import json
+from unittest import mock
 
-import mock
 import six
 import sqlalchemy as sa
 

mistral/tests/unit/api/v2/test_event_trigger.py

@@ -14,8 +14,8 @@
 
 import copy
 import json
+from unittest import mock
 
-import mock
 import sqlalchemy as sa
 
 from mistral.db.v2 import api as db_api

mistral/tests/unit/api/v2/test_executions.py

@@ -19,8 +19,8 @@
 import copy
 import datetime
 import json
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 import oslo_messaging
 from oslo_utils import uuidutils

mistral/tests/unit/api/v2/test_keycloak_auth.py

@@ -14,11 +14,12 @@
 
 import datetime
 import json
-import mock
 import pecan
 import pecan.testing
 import requests
 import requests_mock
+from unittest import mock
+
 import webob
 
 from mistral.api import app as pecan_app

mistral/tests/unit/api/v2/test_members.py

@@ -13,8 +13,8 @@
 # under the License.
 
 import copy
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_utils import uuidutils
 import sqlalchemy as sa

mistral/tests/unit/api/v2/test_services.py

@@ -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 oslo_config import cfg
 import tooz.coordination
 from webtest import app as webtest_app

mistral/tests/unit/api/v2/test_tasks.py

@@ -17,8 +17,8 @@
 import copy
 import datetime
 import json
+from unittest import mock
 
-import mock
 import sqlalchemy as sa
 
 from mistral.db.v2 import api as db_api

mistral/tests/unit/api/v2/test_workbooks.py

@@ -14,8 +14,8 @@
 #    limitations under the License.
 
 import copy
+from unittest import mock
 
-import mock
 import sqlalchemy as sa
 
 from mistral.db.v2 import api as db_api

mistral/tests/unit/api/v2/test_workflows.py

@@ -15,9 +15,9 @@
 
 import copy
 import datetime
+from unittest import mock
 
 import json
-import mock
 import sqlalchemy as sa
 import yaml
 

mistral/tests/unit/base.py

@@ -18,8 +18,8 @@ import json
 import pkg_resources as pkg
 import sys
 import time
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslotest import base

mistral/tests/unit/engine/test_action_caching.py

@@ -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 cachetools
 from oslo_config import cfg

mistral/tests/unit/engine/test_action_context.py

@@ -10,7 +10,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import mock
+from unittest import mock
 
 from mistral.db.v2 import api as db_api
 from mistral.services import workflows as wf_service

mistral/tests/unit/engine/test_action_defaults.py

@@ -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 oslo_config import cfg
 import requests
 

mistral/tests/unit/engine/test_action_heartbeat_checker.py

@@ -11,7 +11,7 @@
 #    limitations under the License.
 
 import cachetools
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 

mistral/tests/unit/engine/test_action_heartbeat_sender.py

@@ -10,7 +10,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 

mistral/tests/unit/engine/test_cron_trigger.py

@@ -12,8 +12,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 import datetime
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 
 from mistral import context as auth_ctx

mistral/tests/unit/engine/test_default_engine.py

@@ -14,8 +14,8 @@
 #    limitations under the License.
 
 import datetime
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_messaging.rpc import client as rpc_client
 from oslo_utils import uuidutils

mistral/tests/unit/engine/test_direct_workflow_rerun.py

@@ -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 oslo_config import cfg
 import testtools

mistral/tests/unit/engine/test_direct_workflow_rerun_cancelled.py

@@ -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 oslo_config import cfg
 

mistral/tests/unit/engine/test_disabled_yaql_conversion.py

@@ -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 mistral.db.v2 import api as db_api
 from mistral.engine import engine_server

mistral/tests/unit/engine/test_environment.py

@@ -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 oslo_config import cfg
 
 from mistral.db.v2 import api as db_api

mistral/tests/unit/engine/test_error_handling.py

@@ -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 oslo_config import cfg
 from oslo_db import exception as db_exc
 

mistral/tests/unit/engine/test_javascript_action.py

@@ -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 oslo_config import cfg
 from oslo_utils import importutils
 import testtools

mistral/tests/unit/engine/test_policies.py

@@ -13,7 +13,8 @@
 #    limitations under the License.
 
 from eventlet import timeout
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 import requests
 

mistral/tests/unit/engine/test_profiler.py

@@ -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 oslo_config import cfg
 import osprofiler

mistral/tests/unit/engine/test_reverse_workflow_rerun.py

@@ -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 oslo_config import cfg
 

mistral/tests/unit/engine/test_reverse_workflow_rerun_cancelled.py

@@ -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 oslo_config import cfg
 

mistral/tests/unit/engine/test_run_action.py

@@ -13,7 +13,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 
 from mistral.actions import std_actions

mistral/tests/unit/engine/test_safe_rerun.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from mistral.db.v2 import api as db_api
 from mistral.executors import default_executor as d_exe

mistral/tests/unit/engine/test_state_info.py

@@ -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 oslo_config import cfg
 

mistral/tests/unit/engine/test_subworkflows.py

@@ -13,7 +13,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 
 from mistral.actions import std_actions

mistral/tests/unit/engine/test_task_cancel.py

@@ -13,8 +13,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from mistral.actions import std_actions
 from mistral.db.v2 import api as db_api

mistral/tests/unit/engine/test_task_defaults.py

@@ -13,7 +13,8 @@
 #    limitations under the License.
 
 import datetime as dt
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 import requests
 

mistral/tests/unit/engine/test_task_publish.py

@@ -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 oslo_config import cfg
 

mistral/tests/unit/engine/test_with_items.py

@@ -13,7 +13,8 @@
 #    limitations under the License.
 
 import copy
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 
 from mistral.actions import std_actions

mistral/tests/unit/engine/test_workflow_resume.py

@@ -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 oslo_config import cfg
 
 from mistral.db.v2 import api as db_api

mistral/tests/unit/engine/test_yaql_functions.py

@@ -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 oslo_config import cfg
 

mistral/tests/unit/executors/test_local_executor.py

@@ -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 oslo_config import cfg
 from oslo_log import log as logging

mistral/tests/unit/expressions/test_jinja_expression.py

@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import datetime
-import mock
+from unittest import mock
 
 from mistral.db.v2.sqlalchemy import api as db_api
 from mistral import exceptions as exc

mistral/tests/unit/expressions/test_yaql_expression.py

@@ -17,9 +17,9 @@
 import datetime
 import json
 import sys
+from unittest import mock
 import warnings
 
-import mock
 
 from mistral.config import cfg
 from mistral import exceptions as exc

mistral/tests/unit/hacking/test_checks.py

@@ -11,8 +11,8 @@
 # under the License.
 
 import textwrap
+from unittest import mock
 
-import mock
 import pycodestyle
 
 from mistral.hacking import checks

mistral/tests/unit/notifiers/test_notifier_servers.py

@@ -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 oslo_config import cfg
 from stevedore import exception as sd_exc

mistral/tests/unit/notifiers/test_notify.py

@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import json
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 

mistral/tests/unit/policies/test_actions.py

@@ -13,7 +13,7 @@
 # under the License.
 
 
-import mock
+from unittest import mock
 
 from mistral.db.v2 import api as db_api
 from mistral.db.v2.sqlalchemy import models

mistral/tests/unit/policies/test_workflows.py

@@ -15,8 +15,8 @@
 
 
 import datetime
+from unittest import mock
 
-import mock
 
 from mistral.db.v2 import api as db_api
 from mistral.db.v2.sqlalchemy import models

mistral/tests/unit/rpc/kombu/fake_kombu.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 from kombu import mixins as mx
-import mock
+from unittest import mock
 
 
 # Hack for making tests works with kombu listener

mistral/tests/unit/rpc/kombu/test_kombu_client.py

@@ -16,8 +16,8 @@
 from mistral import exceptions as exc
 from mistral.tests.unit.rpc.kombu import base
 from mistral.tests.unit.rpc.kombu import fake_kombu
+from unittest import mock
 
-import mock
 from six import moves
 
 with mock.patch.dict('sys.modules', kombu=fake_kombu):

mistral/tests/unit/rpc/kombu/test_kombu_listener.py

@@ -17,8 +17,8 @@ from mistral import exceptions as exc
 from mistral.tests.unit.rpc.kombu import base
 from mistral.tests.unit.rpc.kombu import fake_kombu
 from mistral_lib import utils
+from unittest import mock
 
-import mock
 from six import moves
 
 with mock.patch.dict('sys.modules', kombu=fake_kombu):

mistral/tests/unit/rpc/kombu/test_kombu_server.py

@@ -18,8 +18,8 @@ from mistral import context
 from mistral import exceptions as exc
 from mistral.tests.unit.rpc.kombu import base
 from mistral.tests.unit.rpc.kombu import fake_kombu
+from unittest import mock
 
-import mock
 import socket
 from stevedore import driver
 

mistral/tests/unit/scheduler/test_default_scheduler.py

@@ -15,9 +15,9 @@
 from eventlet import event
 from eventlet import semaphore
 from eventlet import timeout
+from unittest import mock
 
 import datetime
-import mock
 
 from oslo_config import cfg
 

mistral/tests/unit/services/test_event_engine.py

@@ -15,8 +15,8 @@
 
 import copy
 import time
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 
 from mistral import context as auth_context

mistral/tests/unit/services/test_legacy_scheduler.py

@@ -15,7 +15,7 @@
 
 import datetime
 import eventlet
-import mock
+from unittest import mock
 
 from eventlet import queue
 from eventlet import timeout

mistral/tests/unit/services/test_trigger_service.py

@@ -14,7 +14,7 @@
 
 import datetime
 import eventlet
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 

mistral/tests/unit/test_coordination.py

@@ -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 oslo_config import cfg
 import six
 

mistral/tests/unit/workflow/test_direct_workflow.py

@@ -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 mistral.db.v2 import api as db_api
 from mistral.db.v2.sqlalchemy import models

test-requirements.txt

@@ -7,7 +7,6 @@ coverage!=4.4,>=4.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
 Pygments>=2.2.0 # BSD license
 fixtures>=3.0.0 # Apache-2.0/BSD
-mock>=2.0.0 # BSD
 nose>=1.3.7 # LGPL
 oslotest>=3.2.0 # Apache-2.0
 requests-mock>=1.2.0 # Apache-2.0