diff --git a/kolla_ansible/tests/unit/test_filters.py b/kolla_ansible/tests/unit/test_filters.py index 8eef4f0e094b2250770214eb12e18626b04e44f7..2ae334ce37fc061dbb628461e16d829d2d82d9fe 100644 --- a/kolla_ansible/tests/unit/test_filters.py +++ b/kolla_ansible/tests/unit/test_filters.py @@ -13,9 +13,9 @@ # under the License. import unittest +from unittest import mock import jinja2 -import mock from kolla_ansible import exception from kolla_ansible import filters diff --git a/lower-constraints.txt b/lower-constraints.txt index b25acf67d3ee64ba4383424b8462a8b484a38b42..a714d26beba50a17adcf5cb403648c540e4e7f28 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -39,7 +39,6 @@ keystoneauth1==3.4.0 linecache2==1.0.0 MarkupSafe==1.0 mccabe==0.2.1 -mock==2.0.0 monotonic==1.4 mox3==0.25.0 msgpack==0.5.6 diff --git a/tests/test_kolla_docker.py b/tests/test_kolla_docker.py index 7fb9b4f0bc178a14f997096402e7ab3d4a64b19e..af00bc89f5d895cee6fb0cedf39ab8c1a42a5844 100644 --- a/tests/test_kolla_docker.py +++ b/tests/test_kolla_docker.py @@ -19,11 +19,8 @@ import copy import imp import os import sys +from unittest import mock -try: - from unittest import mock -except ImportError: - import mock from docker import errors as docker_error from docker.types import Ulimit from oslotest import base diff --git a/tests/test_merge_config.py b/tests/test_merge_config.py index 8091025d183c1860f42538766194d925feac4c8d..ccc70294792c332bc7e7ae7d0a160668e6f075e0 100644 --- a/tests/test_merge_config.py +++ b/tests/test_merge_config.py @@ -16,9 +16,9 @@ import imp import os import sys +from unittest import mock from io import StringIO -import mock from oslotest import base