summaryrefslogtreecommitdiff
path: root/oslo_middleware
diff options
context:
space:
mode:
authorSean McGinnis <sean.mcginnis@gmail.com>2020-03-31 14:10:59 -0500
committerSean McGinnis <sean.mcginnis@gmail.com>2020-03-31 14:32:21 -0500
commit8b2aaa3f6cdcd1840b2b101dd3d0d9bc2034ad9d (patch)
tree953e3f8f2f2e4d563dbade2422114f3a896cdaf3 /oslo_middleware
parenta9f4f3fe91672655db5246b50d502c78333f5793 (diff)
downloadoslo-middleware-8b2aaa3f6cdcd1840b2b101dd3d0d9bc2034ad9d.tar.gz
Use unittest.mock instead of third party mockussuri-em4.0.2
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: I15fc9e39d69f817fb5db8ce7111d0397a25c94b0 Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
Diffstat (limited to 'oslo_middleware')
-rw-r--r--oslo_middleware/tests/test_catch_errors.py3
-rw-r--r--oslo_middleware/tests/test_correlation_id.py3
-rw-r--r--oslo_middleware/tests/test_healthcheck.py2
-rw-r--r--oslo_middleware/tests/test_stats.py2
4 files changed, 6 insertions, 4 deletions
diff --git a/oslo_middleware/tests/test_catch_errors.py b/oslo_middleware/tests/test_catch_errors.py
index 7a06218..fa6d518 100644
--- a/oslo_middleware/tests/test_catch_errors.py
+++ b/oslo_middleware/tests/test_catch_errors.py
@@ -13,8 +13,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from unittest import mock
+
import fixtures
-import mock
from oslotest import base as test_base
import webob.dec
import webob.exc
diff --git a/oslo_middleware/tests/test_correlation_id.py b/oslo_middleware/tests/test_correlation_id.py
index e2685bf..738fa37 100644
--- a/oslo_middleware/tests/test_correlation_id.py
+++ b/oslo_middleware/tests/test_correlation_id.py
@@ -13,8 +13,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from unittest import mock
+
import fixtures
-import mock
from oslotest import base as test_base
from oslo_middleware import correlation_id
diff --git a/oslo_middleware/tests/test_healthcheck.py b/oslo_middleware/tests/test_healthcheck.py
index 9220ea4..d82316f 100644
--- a/oslo_middleware/tests/test_healthcheck.py
+++ b/oslo_middleware/tests/test_healthcheck.py
@@ -15,8 +15,8 @@
import threading
import time
+from unittest import mock
-import mock
from oslo_config import fixture as config
from oslo_serialization import jsonutils
from oslotest import base as test_base
diff --git a/oslo_middleware/tests/test_stats.py b/oslo_middleware/tests/test_stats.py
index 66dfaaf..c6a1771 100644
--- a/oslo_middleware/tests/test_stats.py
+++ b/oslo_middleware/tests/test_stats.py
@@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
+from unittest import mock
import uuid
-import mock
from oslotest import base as test_base
import statsd
import webob.dec