diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-03 11:45:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-03 11:45:24 +0000 |
| commit | 3b90ed3c3ccd1c7af5bff0067ae71cab650df3e5 (patch) | |
| tree | 1a7debbb82eea020e12cc18494ee3c383ed42ebd /tests | |
| parent | 0e8863d77d75c8b4254ba22afe090f6070411706 (diff) | |
| parent | 924e7a40f185fd3116d593ba0353046bd7c81e1b (diff) | |
| download | kolla-3b90ed3c3ccd1c7af5bff0067ae71cab650df3e5.tar.gz kolla-3b90ed3c3ccd1c7af5bff0067ae71cab650df3e5.zip | |
Merge "Use unittest.mock instead of PyPI mock"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_build.py | 2 | ||||
| -rw-r--r-- | tests/test_set_config.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_build.py b/tests/test_build.py index 632931ee4..c4a4a6aed 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -13,8 +13,8 @@ import multiprocessing import os import sys +from unittest.mock import patch -from mock import patch from oslo_log import fixture as log_fixture from oslo_log import log as logging from oslotest import base diff --git a/tests/test_set_config.py b/tests/test_set_config.py index e4706c99d..7016d8fa3 100644 --- a/tests/test_set_config.py +++ b/tests/test_set_config.py @@ -13,9 +13,9 @@ import copy import imp import json -import mock import os.path import sys +from unittest import mock from oslotest import base |
