diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-17 19:02:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-17 19:02:45 +0000 |
| commit | e5142bbf037292814f55b221b2cb223bae785996 (patch) | |
| tree | 8910124521109a418cec4cdb32415c0069543f93 /oslo_config | |
| parent | 76075a6d992c08a29da76c34fb2a7d9164f721d0 (diff) | |
| parent | 66b3da9689e293cdb819e989b6c469012b3db756 (diff) | |
| download | oslo-config-e5142bbf037292814f55b221b2cb223bae785996.tar.gz | |
Merge "Use unittest.mock instead of third party mock"
Diffstat (limited to 'oslo_config')
| -rw-r--r-- | oslo_config/tests/test_cfg.py | 2 | ||||
| -rw-r--r-- | oslo_config/tests/test_generator.py | 2 | ||||
| -rw-r--r-- | oslo_config/tests/test_sphinxconfiggen.py | 3 | ||||
| -rw-r--r-- | oslo_config/tests/test_sphinxext.py | 2 | ||||
| -rw-r--r-- | oslo_config/tests/test_validator.py | 3 |
5 files changed, 7 insertions, 5 deletions
diff --git a/oslo_config/tests/test_cfg.py b/oslo_config/tests/test_cfg.py index 98bd8e3..ac45780 100644 --- a/oslo_config/tests/test_cfg.py +++ b/oslo_config/tests/test_cfg.py @@ -21,9 +21,9 @@ import os import shutil import sys import tempfile +from unittest import mock import fixtures -import mock from oslotest import base import testscenarios diff --git a/oslo_config/tests/test_generator.py b/oslo_config/tests/test_generator.py index becd49a..9ddb56f 100644 --- a/oslo_config/tests/test_generator.py +++ b/oslo_config/tests/test_generator.py @@ -15,9 +15,9 @@ import io import sys import textwrap +from unittest import mock import fixtures -import mock from oslotest import base import tempfile import testscenarios diff --git a/oslo_config/tests/test_sphinxconfiggen.py b/oslo_config/tests/test_sphinxconfiggen.py index 982641e..e4ddcba 100644 --- a/oslo_config/tests/test_sphinxconfiggen.py +++ b/oslo_config/tests/test_sphinxconfiggen.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslotest import base from oslo_config import sphinxconfiggen diff --git a/oslo_config/tests/test_sphinxext.py b/oslo_config/tests/test_sphinxext.py index b35af71..340ee4e 100644 --- a/oslo_config/tests/test_sphinxext.py +++ b/oslo_config/tests/test_sphinxext.py @@ -11,8 +11,8 @@ # under the License. import textwrap +from unittest import mock -import mock from oslotest import base from oslo_config import cfg diff --git a/oslo_config/tests/test_validator.py b/oslo_config/tests/test_validator.py index a2ffde7..de912ac 100644 --- a/oslo_config/tests/test_validator.py +++ b/oslo_config/tests/test_validator.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslotest import base from oslo_config import cfg |