From 47e1cc38fdb656d359e9cbb8a10053997b8f68ba Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 23 May 2022 11:04:56 -0700 Subject: [PATCH] [stable-2.13] Use unittest.mock instead of mock. (#77883) This can only be done for controller tests. (cherry picked from commit 3a9a23fb1a7e617479d0ae72dadba0f7a739d13a) Co-authored-by: Matt Clay --- test/units/_vendor/test_vendor.py | 2 +- test/units/cli/test_cli.py | 2 +- test/units/cli/test_console.py | 2 +- test/units/cli/test_galaxy.py | 2 +- test/units/cli/test_vault.py | 2 +- test/units/errors/test_errors.py | 2 +- test/units/executor/test_interpreter_discovery.py | 2 +- test/units/executor/test_play_iterator.py | 2 +- test/units/executor/test_playbook_executor.py | 2 +- test/units/executor/test_task_executor.py | 4 ++-- test/units/executor/test_task_queue_manager_callbacks.py | 2 +- test/units/executor/test_task_result.py | 2 +- test/units/galaxy/test_api.py | 2 +- test/units/galaxy/test_collection.py | 2 +- test/units/galaxy/test_collection_install.py | 2 +- test/units/galaxy/test_token.py | 2 +- test/units/mock/path.py | 2 +- test/units/parsing/test_dataloader.py | 2 +- test/units/parsing/vault/test_vault.py | 2 +- test/units/parsing/vault/test_vault_editor.py | 2 +- test/units/playbook/role/test_include_role.py | 2 +- test/units/playbook/role/test_role.py | 2 +- test/units/playbook/test_conditional.py | 2 +- test/units/playbook/test_helpers.py | 2 +- test/units/playbook/test_included_file.py | 2 +- test/units/playbook/test_task.py | 2 +- test/units/plugins/action/test_action.py | 2 +- test/units/plugins/action/test_gather_facts.py | 2 +- test/units/plugins/action/test_raw.py | 2 +- test/units/plugins/cache/test_cache.py | 2 +- test/units/plugins/callback/test_callback.py | 2 +- test/units/plugins/connection/test_psrp.py | 2 +- test/units/plugins/connection/test_ssh.py | 2 +- test/units/plugins/connection/test_winrm.py | 2 +- test/units/plugins/inventory/test_inventory.py | 2 +- test/units/plugins/inventory/test_script.py | 2 +- test/units/plugins/lookup/test_password.py | 2 +- test/units/plugins/strategy/test_linear.py | 2 +- test/units/plugins/strategy/test_strategy.py | 2 +- test/units/plugins/test_plugins.py | 2 +- test/units/template/test_templar.py | 2 +- test/units/template/test_vars.py | 2 +- test/units/utils/collection_loader/test_collection_loader.py | 2 +- test/units/utils/display/test_broken_cowsay.py | 2 +- test/units/utils/test_display.py | 2 +- test/units/utils/test_vars.py | 2 +- test/units/vars/test_variable_manager.py | 2 +- 47 files changed, 48 insertions(+), 48 deletions(-) diff --git a/test/units/_vendor/test_vendor.py b/test/units/_vendor/test_vendor.py index cda0279d60e5fe..84b850e2d88886 100644 --- a/test/units/_vendor/test_vendor.py +++ b/test/units/_vendor/test_vendor.py @@ -9,7 +9,7 @@ import pytest import sys -from mock import MagicMock, NonCallableMagicMock, patch +from unittest.mock import MagicMock, NonCallableMagicMock, patch def reset_internal_vendor_package(): diff --git a/test/units/cli/test_cli.py b/test/units/cli/test_cli.py index 262859552cf447..79c2b8fb988c31 100644 --- a/test/units/cli/test_cli.py +++ b/test/units/cli/test_cli.py @@ -20,7 +20,7 @@ __metaclass__ = type from units.compat import unittest -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock from units.mock.loader import DictDataLoader diff --git a/test/units/cli/test_console.py b/test/units/cli/test_console.py index fb477bf3920e8a..4fc05dd36aa46c 100644 --- a/test/units/cli/test_console.py +++ b/test/units/cli/test_console.py @@ -20,7 +20,7 @@ __metaclass__ = type from units.compat import unittest -from mock import patch +from unittest.mock import patch from ansible.cli.console import ConsoleCLI diff --git a/test/units/cli/test_galaxy.py b/test/units/cli/test_galaxy.py index 1a6bfe04b60762..3b975beedd8bc2 100644 --- a/test/units/cli/test_galaxy.py +++ b/test/units/cli/test_galaxy.py @@ -41,7 +41,7 @@ from ansible.utils import context_objects as co from ansible.utils.display import Display from units.compat import unittest -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock @pytest.fixture(autouse='function') diff --git a/test/units/cli/test_vault.py b/test/units/cli/test_vault.py index 76ffba2f42428f..2304f4d5cd1aeb 100644 --- a/test/units/cli/test_vault.py +++ b/test/units/cli/test_vault.py @@ -24,7 +24,7 @@ import pytest from units.compat import unittest -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock from units.mock.vault_helper import TextVaultSecret from ansible import context, errors diff --git a/test/units/errors/test_errors.py b/test/units/errors/test_errors.py index deb3dc0b1c76a1..005be29e88c174 100644 --- a/test/units/errors/test_errors.py +++ b/test/units/errors/test_errors.py @@ -21,7 +21,7 @@ from units.compat import unittest -from mock import mock_open, patch +from unittest.mock import mock_open, patch from ansible.errors import AnsibleError from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject diff --git a/test/units/executor/test_interpreter_discovery.py b/test/units/executor/test_interpreter_discovery.py index 5efdd37894c937..43db59505636c8 100644 --- a/test/units/executor/test_interpreter_discovery.py +++ b/test/units/executor/test_interpreter_discovery.py @@ -6,7 +6,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from mock import MagicMock +from unittest.mock import MagicMock from ansible.executor.interpreter_discovery import discover_interpreter from ansible.module_utils._text import to_text diff --git a/test/units/executor/test_play_iterator.py b/test/units/executor/test_play_iterator.py index 3ced9e3cceeeb0..14c28135ac864b 100644 --- a/test/units/executor/test_play_iterator.py +++ b/test/units/executor/test_play_iterator.py @@ -20,7 +20,7 @@ __metaclass__ = type from units.compat import unittest -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock from ansible.executor.play_iterator import HostState, PlayIterator, IteratingStates, FailedStates from ansible.playbook import Playbook diff --git a/test/units/executor/test_playbook_executor.py b/test/units/executor/test_playbook_executor.py index 350f7c2dcf8431..6032dbb2abdbec 100644 --- a/test/units/executor/test_playbook_executor.py +++ b/test/units/executor/test_playbook_executor.py @@ -20,7 +20,7 @@ __metaclass__ = type from units.compat import unittest -from mock import MagicMock +from unittest.mock import MagicMock from ansible.executor.playbook_executor import PlaybookExecutor from ansible.playbook import Playbook diff --git a/test/units/executor/test_task_executor.py b/test/units/executor/test_task_executor.py index 30d609a1aba228..29eb7898ce3018 100644 --- a/test/units/executor/test_task_executor.py +++ b/test/units/executor/test_task_executor.py @@ -19,10 +19,10 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import mock +from unittest import mock from units.compat import unittest -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock from ansible.errors import AnsibleError from ansible.executor.task_executor import TaskExecutor, remove_omit from ansible.plugins.loader import action_loader, lookup_loader diff --git a/test/units/executor/test_task_queue_manager_callbacks.py b/test/units/executor/test_task_queue_manager_callbacks.py index b6b1159d174021..c63385dc8b6dd2 100644 --- a/test/units/executor/test_task_queue_manager_callbacks.py +++ b/test/units/executor/test_task_queue_manager_callbacks.py @@ -19,7 +19,7 @@ from __future__ import (absolute_import, division, print_function) from units.compat import unittest -from mock import MagicMock +from unittest.mock import MagicMock from ansible.executor.task_queue_manager import TaskQueueManager from ansible.playbook import Playbook diff --git a/test/units/executor/test_task_result.py b/test/units/executor/test_task_result.py index ee5c71986f98e1..8b79571f23e9d7 100644 --- a/test/units/executor/test_task_result.py +++ b/test/units/executor/test_task_result.py @@ -20,7 +20,7 @@ __metaclass__ = type from units.compat import unittest -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock from ansible.executor.task_result import TaskResult diff --git a/test/units/galaxy/test_api.py b/test/units/galaxy/test_api.py index 733f99b5718396..e7bee589c0f90a 100644 --- a/test/units/galaxy/test_api.py +++ b/test/units/galaxy/test_api.py @@ -16,7 +16,7 @@ import time from io import BytesIO, StringIO -from mock import MagicMock +from unittest.mock import MagicMock import ansible.constants as C from ansible import context diff --git a/test/units/galaxy/test_collection.py b/test/units/galaxy/test_collection.py index 53d042fe60236f..4cfca394464104 100644 --- a/test/units/galaxy/test_collection.py +++ b/test/units/galaxy/test_collection.py @@ -15,7 +15,7 @@ from hashlib import sha256 from io import BytesIO -from mock import MagicMock, mock_open, patch +from unittest.mock import MagicMock, mock_open, patch import ansible.constants as C from ansible import context diff --git a/test/units/galaxy/test_collection_install.py b/test/units/galaxy/test_collection_install.py index e34472f2e68c60..7525a194ca62eb 100644 --- a/test/units/galaxy/test_collection_install.py +++ b/test/units/galaxy/test_collection_install.py @@ -17,7 +17,7 @@ import yaml from io import BytesIO, StringIO -from mock import MagicMock, patch +from unittest.mock import MagicMock, patch from unittest import mock import ansible.module_utils.six.moves.urllib.error as urllib_error diff --git a/test/units/galaxy/test_token.py b/test/units/galaxy/test_token.py index 98dec5bfabea16..24af38631420f1 100644 --- a/test/units/galaxy/test_token.py +++ b/test/units/galaxy/test_token.py @@ -8,7 +8,7 @@ import os import pytest -from mock import MagicMock +from unittest.mock import MagicMock import ansible.constants as C from ansible.cli.galaxy import GalaxyCLI, SERVER_DEF diff --git a/test/units/mock/path.py b/test/units/mock/path.py index dc51a143cb3453..c24ddf42dccade 100644 --- a/test/units/mock/path.py +++ b/test/units/mock/path.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from mock import MagicMock +from unittest.mock import MagicMock from ansible.utils.path import unfrackpath diff --git a/test/units/parsing/test_dataloader.py b/test/units/parsing/test_dataloader.py index ed365b130f121a..9ec49a8d319c09 100644 --- a/test/units/parsing/test_dataloader.py +++ b/test/units/parsing/test_dataloader.py @@ -22,7 +22,7 @@ import os from units.compat import unittest -from mock import patch, mock_open +from unittest.mock import patch, mock_open from ansible.errors import AnsibleParserError, yaml_strings, AnsibleFileNotFound from ansible.parsing.vault import AnsibleVaultError from ansible.module_utils._text import to_text diff --git a/test/units/parsing/vault/test_vault.py b/test/units/parsing/vault/test_vault.py index f92d451c5eeeea..7afd3560080b30 100644 --- a/test/units/parsing/vault/test_vault.py +++ b/test/units/parsing/vault/test_vault.py @@ -30,7 +30,7 @@ import pytest from units.compat import unittest -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock from ansible import errors from ansible.module_utils import six diff --git a/test/units/parsing/vault/test_vault_editor.py b/test/units/parsing/vault/test_vault_editor.py index 3f19b893e8235f..77509f08aa4ea9 100644 --- a/test/units/parsing/vault/test_vault_editor.py +++ b/test/units/parsing/vault/test_vault_editor.py @@ -27,7 +27,7 @@ import pytest from units.compat import unittest -from mock import patch +from unittest.mock import patch from ansible import errors from ansible.parsing import vault diff --git a/test/units/playbook/role/test_include_role.py b/test/units/playbook/role/test_include_role.py index 79821b40f324eb..5e7625ba14c1dc 100644 --- a/test/units/playbook/role/test_include_role.py +++ b/test/units/playbook/role/test_include_role.py @@ -20,7 +20,7 @@ __metaclass__ = type from units.compat import unittest -from mock import patch +from unittest.mock import patch from ansible.playbook import Play from ansible.playbook.role_include import IncludeRole diff --git a/test/units/playbook/role/test_role.py b/test/units/playbook/role/test_role.py index dacbc79cb2a8db..5d47631fe26400 100644 --- a/test/units/playbook/role/test_role.py +++ b/test/units/playbook/role/test_role.py @@ -22,7 +22,7 @@ from collections.abc import Container from units.compat import unittest -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock from ansible.errors import AnsibleError, AnsibleParserError from ansible.playbook.block import Block diff --git a/test/units/playbook/test_conditional.py b/test/units/playbook/test_conditional.py index 17284ca225865e..03ab3b7fa6a7ef 100644 --- a/test/units/playbook/test_conditional.py +++ b/test/units/playbook/test_conditional.py @@ -3,7 +3,7 @@ from units.compat import unittest from units.mock.loader import DictDataLoader -from mock import MagicMock +from unittest.mock import MagicMock from ansible.template import Templar from ansible import errors diff --git a/test/units/playbook/test_helpers.py b/test/units/playbook/test_helpers.py index a921a727ccd097..d171bc380becdf 100644 --- a/test/units/playbook/test_helpers.py +++ b/test/units/playbook/test_helpers.py @@ -22,7 +22,7 @@ import os from units.compat import unittest -from mock import MagicMock +from unittest.mock import MagicMock from units.mock.loader import DictDataLoader from ansible import errors diff --git a/test/units/playbook/test_included_file.py b/test/units/playbook/test_included_file.py index bf79b9275fa093..7341dffa6b76e6 100644 --- a/test/units/playbook/test_included_file.py +++ b/test/units/playbook/test_included_file.py @@ -23,7 +23,7 @@ import pytest -from mock import MagicMock +from unittest.mock import MagicMock from units.mock.loader import DictDataLoader from ansible.playbook.block import Block diff --git a/test/units/playbook/test_task.py b/test/units/playbook/test_task.py index 53a66705013c7a..070d7aa761175e 100644 --- a/test/units/playbook/test_task.py +++ b/test/units/playbook/test_task.py @@ -20,7 +20,7 @@ __metaclass__ = type from units.compat import unittest -from mock import patch +from unittest.mock import patch from ansible.playbook.task import Task from ansible.parsing.yaml import objects from ansible import errors diff --git a/test/units/plugins/action/test_action.py b/test/units/plugins/action/test_action.py index 70885181f74008..78c6fe057194c7 100644 --- a/test/units/plugins/action/test_action.py +++ b/test/units/plugins/action/test_action.py @@ -25,7 +25,7 @@ from ansible import constants as C from units.compat import unittest -from mock import patch, MagicMock, mock_open +from unittest.mock import patch, MagicMock, mock_open from ansible.errors import AnsibleError, AnsibleAuthenticationFailure from ansible.module_utils.six import text_type diff --git a/test/units/plugins/action/test_gather_facts.py b/test/units/plugins/action/test_gather_facts.py index e8a607b7f8cd6a..20225aa95889bd 100644 --- a/test/units/plugins/action/test_gather_facts.py +++ b/test/units/plugins/action/test_gather_facts.py @@ -19,7 +19,7 @@ __metaclass__ = type from units.compat import unittest -from mock import MagicMock, patch +from unittest.mock import MagicMock, patch from ansible import constants as C from ansible.playbook.task import Task diff --git a/test/units/plugins/action/test_raw.py b/test/units/plugins/action/test_raw.py index da21638511673f..33480516d7391d 100644 --- a/test/units/plugins/action/test_raw.py +++ b/test/units/plugins/action/test_raw.py @@ -22,7 +22,7 @@ from ansible.errors import AnsibleActionFail from units.compat import unittest -from mock import MagicMock, Mock +from unittest.mock import MagicMock, Mock from ansible.plugins.action.raw import ActionModule from ansible.playbook.task import Task from ansible.plugins.loader import connection_loader diff --git a/test/units/plugins/cache/test_cache.py b/test/units/plugins/cache/test_cache.py index d0a39f39d3f2dd..9fdff1f644f97c 100644 --- a/test/units/plugins/cache/test_cache.py +++ b/test/units/plugins/cache/test_cache.py @@ -23,7 +23,7 @@ import shutil import tempfile -import mock +from unittest import mock from units.compat import unittest from ansible.errors import AnsibleError diff --git a/test/units/plugins/callback/test_callback.py b/test/units/plugins/callback/test_callback.py index 81ee3745e800ea..ccfa4658e54585 100644 --- a/test/units/plugins/callback/test_callback.py +++ b/test/units/plugins/callback/test_callback.py @@ -25,7 +25,7 @@ import types from units.compat import unittest -from mock import MagicMock +from unittest.mock import MagicMock from ansible.executor.task_result import TaskResult from ansible.inventory.host import Host diff --git a/test/units/plugins/connection/test_psrp.py b/test/units/plugins/connection/test_psrp.py index 73516cc60bc3f1..38052e81d3854b 100644 --- a/test/units/plugins/connection/test_psrp.py +++ b/test/units/plugins/connection/test_psrp.py @@ -10,7 +10,7 @@ import sys from io import StringIO -from mock import MagicMock +from unittest.mock import MagicMock from ansible.playbook.play_context import PlayContext from ansible.plugins.loader import connection_loader diff --git a/test/units/plugins/connection/test_ssh.py b/test/units/plugins/connection/test_ssh.py index e7f4dd1271a4ff..662dff91928602 100644 --- a/test/units/plugins/connection/test_ssh.py +++ b/test/units/plugins/connection/test_ssh.py @@ -27,7 +27,7 @@ from ansible import constants as C from ansible.errors import AnsibleAuthenticationFailure from units.compat import unittest -from mock import patch, MagicMock, PropertyMock +from unittest.mock import patch, MagicMock, PropertyMock from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound from ansible.module_utils.compat.selectors import SelectorKey, EVENT_READ from ansible.module_utils.six.moves import shlex_quote diff --git a/test/units/plugins/connection/test_winrm.py b/test/units/plugins/connection/test_winrm.py index c3245ccb0107d0..cb52814b86acc0 100644 --- a/test/units/plugins/connection/test_winrm.py +++ b/test/units/plugins/connection/test_winrm.py @@ -12,7 +12,7 @@ from io import StringIO -from mock import MagicMock +from unittest.mock import MagicMock from ansible.errors import AnsibleConnectionFailure from ansible.module_utils._text import to_bytes from ansible.playbook.play_context import PlayContext diff --git a/test/units/plugins/inventory/test_inventory.py b/test/units/plugins/inventory/test_inventory.py index 08148f8b625832..df246073659761 100644 --- a/test/units/plugins/inventory/test_inventory.py +++ b/test/units/plugins/inventory/test_inventory.py @@ -22,7 +22,7 @@ import string import textwrap -import mock +from unittest import mock from ansible import constants as C from units.compat import unittest diff --git a/test/units/plugins/inventory/test_script.py b/test/units/plugins/inventory/test_script.py index 1a00946c569279..9f75199f1632bd 100644 --- a/test/units/plugins/inventory/test_script.py +++ b/test/units/plugins/inventory/test_script.py @@ -22,7 +22,7 @@ __metaclass__ = type import pytest -import mock +from unittest import mock from ansible import constants as C from ansible.errors import AnsibleError diff --git a/test/units/plugins/lookup/test_password.py b/test/units/plugins/lookup/test_password.py index c496ee6ed13a34..73b50418e18c2c 100644 --- a/test/units/plugins/lookup/test_password.py +++ b/test/units/plugins/lookup/test_password.py @@ -32,7 +32,7 @@ from units.mock.loader import DictDataLoader from units.compat import unittest -from mock import mock_open, patch +from unittest.mock import mock_open, patch from ansible.errors import AnsibleError from ansible.module_utils.six import text_type from ansible.module_utils.six.moves import builtins diff --git a/test/units/plugins/strategy/test_linear.py b/test/units/plugins/strategy/test_linear.py index 3bce485613f9c3..2574e84fff3420 100644 --- a/test/units/plugins/strategy/test_linear.py +++ b/test/units/plugins/strategy/test_linear.py @@ -7,7 +7,7 @@ from units.compat import unittest -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock from ansible.executor.play_iterator import PlayIterator from ansible.playbook import Playbook diff --git a/test/units/plugins/strategy/test_strategy.py b/test/units/plugins/strategy/test_strategy.py index 750e80690645a8..bc4bb545154c99 100644 --- a/test/units/plugins/strategy/test_strategy.py +++ b/test/units/plugins/strategy/test_strategy.py @@ -23,7 +23,7 @@ import uuid from units.compat import unittest -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock from ansible.executor.process.worker import WorkerProcess from ansible.executor.task_queue_manager import TaskQueueManager from ansible.executor.task_result import TaskResult diff --git a/test/units/plugins/test_plugins.py b/test/units/plugins/test_plugins.py index 975fa420b155f8..46cd582d352ce3 100644 --- a/test/units/plugins/test_plugins.py +++ b/test/units/plugins/test_plugins.py @@ -23,7 +23,7 @@ import os from units.compat import unittest -from mock import patch, MagicMock +from unittest.mock import patch, MagicMock from ansible.plugins.loader import PluginLoader, PluginPathContext diff --git a/test/units/template/test_templar.py b/test/units/template/test_templar.py index e922f95f36a1de..6747f768313c1f 100644 --- a/test/units/template/test_templar.py +++ b/test/units/template/test_templar.py @@ -22,7 +22,7 @@ from jinja2.runtime import Context from units.compat import unittest -from mock import patch +from unittest.mock import patch from ansible import constants as C from ansible.errors import AnsibleError, AnsibleUndefinedVariable diff --git a/test/units/template/test_vars.py b/test/units/template/test_vars.py index 3e04ba2fab4288..514104f23bf5a3 100644 --- a/test/units/template/test_vars.py +++ b/test/units/template/test_vars.py @@ -20,7 +20,7 @@ __metaclass__ = type from units.compat import unittest -from mock import MagicMock +from unittest.mock import MagicMock from ansible.template.vars import AnsibleJ2Vars diff --git a/test/units/utils/collection_loader/test_collection_loader.py b/test/units/utils/collection_loader/test_collection_loader.py index 3ae04cbd100a7c..f7050dcd6d047f 100644 --- a/test/units/utils/collection_loader/test_collection_loader.py +++ b/test/units/utils/collection_loader/test_collection_loader.py @@ -17,7 +17,7 @@ _get_collection_name_from_path, _get_collection_role_path, _get_collection_metadata, _iter_modules_impl ) from ansible.utils.collection_loader._collection_config import _EventSource -from mock import MagicMock, NonCallableMagicMock, patch +from unittest.mock import MagicMock, NonCallableMagicMock, patch # fixture to ensure we always clean up the import stuff when we're done diff --git a/test/units/utils/display/test_broken_cowsay.py b/test/units/utils/display/test_broken_cowsay.py index e93065d8e01f14..d888010ae53004 100644 --- a/test/units/utils/display/test_broken_cowsay.py +++ b/test/units/utils/display/test_broken_cowsay.py @@ -8,7 +8,7 @@ from ansible.utils.display import Display -from mock import MagicMock +from unittest.mock import MagicMock def test_display_with_fake_cowsay_binary(capsys, mocker): diff --git a/test/units/utils/test_display.py b/test/units/utils/test_display.py index 8807b81675b060..4883a5becc906b 100644 --- a/test/units/utils/test_display.py +++ b/test/units/utils/test_display.py @@ -5,7 +5,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from mock import MagicMock +from unittest.mock import MagicMock import pytest diff --git a/test/units/utils/test_vars.py b/test/units/utils/test_vars.py index 1df0eab32bb310..9be33de429a9ae 100644 --- a/test/units/utils/test_vars.py +++ b/test/units/utils/test_vars.py @@ -22,7 +22,7 @@ from collections import defaultdict -import mock +from unittest import mock from units.compat import unittest from ansible.errors import AnsibleError diff --git a/test/units/vars/test_variable_manager.py b/test/units/vars/test_variable_manager.py index fa68fd3bdbcf1e..67ec120b1da958 100644 --- a/test/units/vars/test_variable_manager.py +++ b/test/units/vars/test_variable_manager.py @@ -22,7 +22,7 @@ import os from units.compat import unittest -from mock import MagicMock, patch +from unittest.mock import MagicMock, patch from ansible.inventory.manager import InventoryManager from ansible.module_utils.six import iteritems from ansible.playbook.play import Play