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 /kolla/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 'kolla/tests')
| -rw-r--r-- | kolla/tests/base.py | 2 | ||||
| -rw-r--r-- | kolla/tests/test_build.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kolla/tests/base.py b/kolla/tests/base.py index 1c43b7619..94bdba509 100644 --- a/kolla/tests/base.py +++ b/kolla/tests/base.py @@ -11,9 +11,9 @@ # limitations under the License. import os +from unittest import mock import fixtures -import mock from oslo_config import cfg from oslotest import base as oslotest_base diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index 5b3e981d6..b7f5c30c0 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -12,10 +12,10 @@ import fixtures import itertools -import mock import os import requests import sys +from unittest import mock from kolla.cmd import build as build_cmd from kolla import exception |
