diff --git a/os_collect_config/tests/test_collect.py b/os_collect_config/tests/test_collect.py index 3b09425..9c87ec8 100644 --- a/os_collect_config/tests/test_collect.py +++ b/os_collect_config/tests/test_collect.py @@ -19,10 +19,10 @@ import os import signal import sys import tempfile +from unittest import mock import extras import fixtures -import mock from oslo_config import cfg import testtools from testtools import matchers diff --git a/os_collect_config/tests/test_config_drive.py b/os_collect_config/tests/test_config_drive.py index ddc9239..f8b8def 100644 --- a/os_collect_config/tests/test_config_drive.py +++ b/os_collect_config/tests/test_config_drive.py @@ -14,9 +14,9 @@ import json import os import subprocess +from unittest import mock import fixtures -import mock import testtools from os_collect_config import config_drive diff --git a/os_collect_config/tests/test_ec2.py b/os_collect_config/tests/test_ec2.py index 8ff7c58..770ec3a 100644 --- a/os_collect_config/tests/test_ec2.py +++ b/os_collect_config/tests/test_ec2.py @@ -15,10 +15,10 @@ import json import os +from unittest import mock import uuid import fixtures -import mock from oslo_config import cfg import requests import six.moves.urllib.parse as urlparse diff --git a/os_collect_config/tests/test_zaqar.py b/os_collect_config/tests/test_zaqar.py index a07d805..5c6bc59 100644 --- a/os_collect_config/tests/test_zaqar.py +++ b/os_collect_config/tests/test_zaqar.py @@ -13,10 +13,10 @@ # limitations under the License. import json +from unittest import mock import fixtures from keystoneclient import discover as ks_discover -import mock from oslo_config import cfg from oslo_config import fixture as config_fixture import testtools diff --git a/test-requirements.txt b/test-requirements.txt index 91b6abf..1cb1476 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,6 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD -mock>=2.0.0 # BSD python-subunit>=1.0.0 # Apache-2.0/BSD sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD stestr>=2.0.0 # Apache-2.0