diff options
| author | Sean McGinnis <sean.mcginnis@gmail.com> | 2020-03-31 14:10:59 -0500 |
|---|---|---|
| committer | Sean McGinnis <sean.mcginnis@gmail.com> | 2020-03-31 14:32:21 -0500 |
| commit | 8b2aaa3f6cdcd1840b2b101dd3d0d9bc2034ad9d (patch) | |
| tree | 953e3f8f2f2e4d563dbade2422114f3a896cdaf3 | |
| parent | a9f4f3fe91672655db5246b50d502c78333f5793 (diff) | |
| download | oslo-middleware-8b2aaa3f6cdcd1840b2b101dd3d0d9bc2034ad9d.tar.gz | |
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>
| -rw-r--r-- | lower-constraints.txt | 1 | ||||
| -rw-r--r-- | oslo_middleware/tests/test_catch_errors.py | 3 | ||||
| -rw-r--r-- | oslo_middleware/tests/test_correlation_id.py | 3 | ||||
| -rw-r--r-- | oslo_middleware/tests/test_healthcheck.py | 2 | ||||
| -rw-r--r-- | oslo_middleware/tests/test_stats.py | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 1 |
6 files changed, 6 insertions, 6 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt index 7d61d49..a9a9af2 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -15,7 +15,6 @@ keystoneauth1==3.4.0 linecache2==1.0.0 MarkupSafe==1.0 mccabe==0.2.1 -mock==2.0.0 mox3==0.20.0 msgpack-python==0.4.0 netaddr==0.7.18 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 diff --git a/test-requirements.txt b/test-requirements.txt index 6f0580b..317d0bc 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,6 @@ fixtures>=3.0.0 # Apache-2.0/BSD hacking>=1.1.0,<1.2.0 # Apache-2.0 -mock>=2.0.0 # BSD oslotest>=3.2.0 # Apache-2.0 testtools>=2.2.0 # MIT coverage!=4.4,>=4.0 # Apache-2.0 |