summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-07-08 17:09:31 +0000
committerGerrit Code Review <review@openstack.org>2020-07-08 17:09:31 +0000
commit055d1601beb95644e37976d9f4aa3601d5084bc1 (patch)
treebd72958d0f64fd3b0c59348b0e9ed6ef850ea72a
parent03c4dfb4ee15b61f3eea41c3f6ec9dc66656d704 (diff)
parentc37f8ff9f034592808b917debd058546cbb67e41 (diff)
downloadpython-designateclient-055d1601beb95644e37976d9f4aa3601d5084bc1.tar.gz
Merge "Use unittest.mock instead of mock"victoria-em4.1.0
-rw-r--r--designateclient/tests/v2/test_nameservers.py2
-rw-r--r--designateclient/tests/v2/test_recordsets.py2
-rw-r--r--designateclient/tests/v2/test_timeout.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/designateclient/tests/v2/test_nameservers.py b/designateclient/tests/v2/test_nameservers.py
index 5ecde20..cceab21 100644
--- a/designateclient/tests/v2/test_nameservers.py
+++ b/designateclient/tests/v2/test_nameservers.py
@@ -13,7 +13,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
-from mock import patch
+from unittest.mock import patch
from designateclient.tests import v2
from designateclient.v2 import zones
diff --git a/designateclient/tests/v2/test_recordsets.py b/designateclient/tests/v2/test_recordsets.py
index 4452396..1478f22 100644
--- a/designateclient/tests/v2/test_recordsets.py
+++ b/designateclient/tests/v2/test_recordsets.py
@@ -13,9 +13,9 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
+from unittest.mock import patch
import uuid
-from mock import patch
import testtools
from designateclient import exceptions
diff --git a/designateclient/tests/v2/test_timeout.py b/designateclient/tests/v2/test_timeout.py
index a5f4d52..0b42a39 100644
--- a/designateclient/tests/v2/test_timeout.py
+++ b/designateclient/tests/v2/test_timeout.py
@@ -16,7 +16,7 @@
from keystoneauth1.identity import generic
from keystoneauth1 import session as keystone_session
-from mock import Mock
+from unittest.mock import Mock
from designateclient.tests import v2
from designateclient.v2.client import Client