diff --git a/azext_iot/tests/central/test_iot_central_unit.py b/azext_iot/tests/central/test_iot_central_unit.py index 3d4c42fab..a4a4253a5 100644 --- a/azext_iot/tests/central/test_iot_central_unit.py +++ b/azext_iot/tests/central/test_iot_central_unit.py @@ -4,11 +4,11 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -import mock import pytest import json import responses import ast +from unittest import mock from datetime import datetime from knack.util import CLIError from azure.cli.core.mock import DummyCli diff --git a/azext_iot/tests/product/test_command_test_case_update_unit.py b/azext_iot/tests/product/test_command_test_case_update_unit.py index e2573a344..c66e4951c 100644 --- a/azext_iot/tests/product/test_command_test_case_update_unit.py +++ b/azext_iot/tests/product/test_command_test_case_update_unit.py @@ -5,7 +5,7 @@ # -------------------------------------------------------------------------------------------- import unittest -import mock +from unittest import mock from knack.util import CLIError from azext_iot.product.test.command_test_cases import update diff --git a/azext_iot/tests/product/test_command_test_create_unit.py b/azext_iot/tests/product/test_command_test_create_unit.py index b749b5218..6c7bcfdb4 100644 --- a/azext_iot/tests/product/test_command_test_create_unit.py +++ b/azext_iot/tests/product/test_command_test_create_unit.py @@ -5,7 +5,7 @@ # -------------------------------------------------------------------------------------------- import unittest -import mock +from unittest import mock from knack.util import CLIError from azext_iot.product.test.command_tests import create, _process_models_directory as process_models from azext_iot.product.shared import BadgeType, AttestationType, DeviceType, ValidationType diff --git a/azext_iot/tests/product/test_command_test_run_unit.py b/azext_iot/tests/product/test_command_test_run_unit.py index ceb80792a..955354494 100644 --- a/azext_iot/tests/product/test_command_test_run_unit.py +++ b/azext_iot/tests/product/test_command_test_run_unit.py @@ -6,9 +6,9 @@ import unittest import pytest -import mock import json import responses +from unittest import mock from datetime import datetime from knack.util import CLIError from azext_iot.product.test.command_test_runs import show, submit diff --git a/azext_iot/tests/product/test_command_test_search_unit.py b/azext_iot/tests/product/test_command_test_search_unit.py index 9eac7c744..e49124ba1 100644 --- a/azext_iot/tests/product/test_command_test_search_unit.py +++ b/azext_iot/tests/product/test_command_test_search_unit.py @@ -5,7 +5,7 @@ # -------------------------------------------------------------------------------------------- import unittest -import mock +from unittest import mock from knack.util import CLIError from azext_iot.product.test.command_tests import search from azext_iot.sdk.product.models import DeviceTestSearchOptions diff --git a/azext_iot/tests/product/test_command_test_update_unit.py b/azext_iot/tests/product/test_command_test_update_unit.py index 649163755..c45b35c60 100644 --- a/azext_iot/tests/product/test_command_test_update_unit.py +++ b/azext_iot/tests/product/test_command_test_update_unit.py @@ -5,7 +5,7 @@ # -------------------------------------------------------------------------------------------- import unittest -import mock +from unittest import mock from knack.util import CLIError from azext_iot.product.test.command_tests import update from azext_iot.product.shared import BadgeType, AttestationType diff --git a/azext_iot/tests/product/test_device_test_tasks_unit.py b/azext_iot/tests/product/test_device_test_tasks_unit.py index dae5e3197..fa0c9d58e 100644 --- a/azext_iot/tests/product/test_device_test_tasks_unit.py +++ b/azext_iot/tests/product/test_device_test_tasks_unit.py @@ -6,9 +6,10 @@ import unittest import pytest -import mock import json import responses + +from unittest import mock from knack.util import CLIError from azext_iot.sdk.product.models import DeviceTestTask, TestRun from azext_iot.product.test.command_test_tasks import create, delete, show diff --git a/azext_iot/tests/utility/test_iot_utility_unit.py b/azext_iot/tests/utility/test_iot_utility_unit.py index df943f6d8..9719ff3b5 100644 --- a/azext_iot/tests/utility/test_iot_utility_unit.py +++ b/azext_iot/tests/utility/test_iot_utility_unit.py @@ -5,10 +5,10 @@ # -------------------------------------------------------------------------------------------- import json -import mock import pytest import os +from unittest import mock from knack.util import CLIError from azure.cli.core.extension import get_extension_path from azext_iot.common.utility import ( diff --git a/azext_iot/tests/utility/test_monitor_parsers_unit.py b/azext_iot/tests/utility/test_monitor_parsers_unit.py index e12e43623..f89b0c776 100644 --- a/azext_iot/tests/utility/test_monitor_parsers_unit.py +++ b/azext_iot/tests/utility/test_monitor_parsers_unit.py @@ -5,9 +5,9 @@ # -------------------------------------------------------------------------------------------- import json -import mock import pytest +from unittest import mock from uamqp.message import Message, MessageProperties from azext_iot.central.providers.v1 import ( CentralDeviceProviderV1, diff --git a/azext_iot/tests/utility/test_uamqp_import.py b/azext_iot/tests/utility/test_uamqp_import.py index e66b24ccd..24e67c61d 100644 --- a/azext_iot/tests/utility/test_uamqp_import.py +++ b/azext_iot/tests/utility/test_uamqp_import.py @@ -4,7 +4,7 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -import mock +from unittest import mock class TestUamqpImport(object):