From 22efa8fd7fb3f5838246b37501418a25158b4d01 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 18 Apr 2020 11:55:19 -0500 Subject: [PATCH] Use unittest.mock instead of third party mock 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: I5ad2c7a44dee2e19ab2576f206c69d94126a22b1 Signed-off-by: Sean McGinnis Co-Authored-By: zhurong --- lower-constraints.txt | 4 ++-- muranodashboard/tests/test_fields.py | 3 +-- muranodashboard/tests/test_tabs.py | 2 +- muranodashboard/tests/unit/catalog/test_views.py | 2 +- muranodashboard/tests/unit/categories/test_views.py | 2 +- muranodashboard/tests/unit/common/test_net.py | 2 +- muranodashboard/tests/unit/common/test_utils.py | 2 +- muranodashboard/tests/unit/dynamic_ui/test_fields.py | 2 +- muranodashboard/tests/unit/dynamic_ui/test_forms.py | 2 +- muranodashboard/tests/unit/dynamic_ui/test_services.py | 2 +- muranodashboard/tests/unit/dynamic_ui/test_yaql_functions.py | 2 +- muranodashboard/tests/unit/environments/test_api.py | 2 +- muranodashboard/tests/unit/environments/test_forms.py | 2 +- muranodashboard/tests/unit/environments/test_rest_api.py | 2 +- muranodashboard/tests/unit/environments/test_tables.py | 2 +- muranodashboard/tests/unit/environments/test_tabs.py | 2 +- muranodashboard/tests/unit/environments/test_topology.py | 2 +- muranodashboard/tests/unit/environments/test_views.py | 2 +- muranodashboard/tests/unit/images/test_forms.py | 2 +- muranodashboard/tests/unit/images/test_views.py | 2 +- muranodashboard/tests/unit/packages/test_api.py | 3 ++- muranodashboard/tests/unit/packages/test_forms.py | 2 +- muranodashboard/tests/unit/packages/test_tables.py | 2 +- muranodashboard/tests/unit/packages/test_views.py | 2 +- muranodashboard/tests/unit/test_api.py | 2 +- requirements.txt | 2 +- test-requirements.txt | 1 - 27 files changed, 28 insertions(+), 29 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index fb94fe619..47df1914e 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -31,7 +31,7 @@ fixtures==3.0.0 flake8==2.5.5 futurist==1.6.0 hacking==0.12.0 -horizon==17.1.0 +horizon==18.3.0 idna==2.6 imagesize==1.0.0 iso8601==0.1.11 @@ -135,7 +135,7 @@ XStatic-jquery-ui==1.12.0.1 XStatic-JQuery.quicksearch==2.0.3.1 XStatic-JQuery.TableSorter==2.14.5.1 XStatic-JSEncrypt==2.3.1.1 -XStatic-mdi==1.4.57.0 +XStatic-mdi==1.6.50.2 XStatic-objectpath==1.2.1.0 XStatic-Rickshaw==1.5.0.0 XStatic-roboto-fontface==0.5.0.0 diff --git a/muranodashboard/tests/test_fields.py b/muranodashboard/tests/test_fields.py index d8d8eee0b..429f65978 100644 --- a/muranodashboard/tests/test_fields.py +++ b/muranodashboard/tests/test_fields.py @@ -13,12 +13,11 @@ # under the License. from django.core import exceptions +from unittest import mock from muranodashboard.dynamic_ui import fields from openstack_dashboard.test import helpers -import mock - class FlavorFlave(object): def __init__(self, id, name, vcpus, disk, ram): diff --git a/muranodashboard/tests/test_tabs.py b/muranodashboard/tests/test_tabs.py index 1375e61a2..dc32e699d 100644 --- a/muranodashboard/tests/test_tabs.py +++ b/muranodashboard/tests/test_tabs.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from muranodashboard.catalog import tabs from openstack_dashboard.test import helpers diff --git a/muranodashboard/tests/unit/catalog/test_views.py b/muranodashboard/tests/unit/catalog/test_views.py index 0ac18e578..9cb262243 100644 --- a/muranodashboard/tests/unit/catalog/test_views.py +++ b/muranodashboard/tests/unit/catalog/test_views.py @@ -13,8 +13,8 @@ # under the License. import collections -import mock import unittest +from unittest import mock from django.conf import settings from django.forms import formsets diff --git a/muranodashboard/tests/unit/categories/test_views.py b/muranodashboard/tests/unit/categories/test_views.py index 584efe3b4..b4d1fb2ae 100644 --- a/muranodashboard/tests/unit/categories/test_views.py +++ b/muranodashboard/tests/unit/categories/test_views.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import unittest +from unittest import mock from muranodashboard.categories import tables from muranodashboard.categories import views diff --git a/muranodashboard/tests/unit/common/test_net.py b/muranodashboard/tests/unit/common/test_net.py index 0a44b23fd..7a47c2f25 100644 --- a/muranodashboard/tests/unit/common/test_net.py +++ b/muranodashboard/tests/unit/common/test_net.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import unittest +from unittest import mock from horizon import exceptions diff --git a/muranodashboard/tests/unit/common/test_utils.py b/muranodashboard/tests/unit/common/test_utils.py index 416ae2207..e2ed4e4c9 100644 --- a/muranodashboard/tests/unit/common/test_utils.py +++ b/muranodashboard/tests/unit/common/test_utils.py @@ -16,8 +16,8 @@ try: import cPickle as pickle except ImportError: import pickle +from unittest import mock -import mock import unittest import yaql diff --git a/muranodashboard/tests/unit/dynamic_ui/test_fields.py b/muranodashboard/tests/unit/dynamic_ui/test_fields.py index 3d7543753..903f30b1f 100644 --- a/muranodashboard/tests/unit/dynamic_ui/test_fields.py +++ b/muranodashboard/tests/unit/dynamic_ui/test_fields.py @@ -16,8 +16,8 @@ from django.core import exceptions from django.core import validators as django_validator from django import forms from django.utils.translation import ugettext_lazy as _ +from unittest import mock -import mock import unittest from muranodashboard.dynamic_ui import fields diff --git a/muranodashboard/tests/unit/dynamic_ui/test_forms.py b/muranodashboard/tests/unit/dynamic_ui/test_forms.py index 41cbc8a50..ebde67ce6 100644 --- a/muranodashboard/tests/unit/dynamic_ui/test_forms.py +++ b/muranodashboard/tests/unit/dynamic_ui/test_forms.py @@ -13,8 +13,8 @@ # under the License. import collections -import mock import unittest +from unittest import mock from yaql.language import contexts as yaql_contexts from django import forms as django_forms diff --git a/muranodashboard/tests/unit/dynamic_ui/test_services.py b/muranodashboard/tests/unit/dynamic_ui/test_services.py index 4167cfdc7..ba4fb05a6 100644 --- a/muranodashboard/tests/unit/dynamic_ui/test_services.py +++ b/muranodashboard/tests/unit/dynamic_ui/test_services.py @@ -15,8 +15,8 @@ import collections from django import forms -import mock import semantic_version +from unittest import mock from yaql.language import factory from muranodashboard.catalog import forms as catalog_forms diff --git a/muranodashboard/tests/unit/dynamic_ui/test_yaql_functions.py b/muranodashboard/tests/unit/dynamic_ui/test_yaql_functions.py index 7d8eaad61..61d29cdfd 100644 --- a/muranodashboard/tests/unit/dynamic_ui/test_yaql_functions.py +++ b/muranodashboard/tests/unit/dynamic_ui/test_yaql_functions.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import re import unittest +from unittest import mock from castellan.common import exception as castellan_exception from castellan.common.objects import opaque_data diff --git a/muranodashboard/tests/unit/environments/test_api.py b/muranodashboard/tests/unit/environments/test_api.py index e936d5a3c..f1fe21142 100644 --- a/muranodashboard/tests/unit/environments/test_api.py +++ b/muranodashboard/tests/unit/environments/test_api.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from muranoclient.common import exceptions as exc from muranoclient.v1 import client diff --git a/muranodashboard/tests/unit/environments/test_forms.py b/muranodashboard/tests/unit/environments/test_forms.py index 826800722..374c3ca11 100644 --- a/muranodashboard/tests/unit/environments/test_forms.py +++ b/muranodashboard/tests/unit/environments/test_forms.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import unittest +from unittest import mock from django.utils.translation import ugettext_lazy as _ diff --git a/muranodashboard/tests/unit/environments/test_rest_api.py b/muranodashboard/tests/unit/environments/test_rest_api.py index 0064d382b..5518ff122 100644 --- a/muranodashboard/tests/unit/environments/test_rest_api.py +++ b/muranodashboard/tests/unit/environments/test_rest_api.py @@ -13,7 +13,7 @@ # under the License. from django import http -import mock +from unittest import mock from muranodashboard.api.rest import environments diff --git a/muranodashboard/tests/unit/environments/test_tables.py b/muranodashboard/tests/unit/environments/test_tables.py index cbb2388df..ec2a24b4d 100644 --- a/muranodashboard/tests/unit/environments/test_tables.py +++ b/muranodashboard/tests/unit/environments/test_tables.py @@ -14,8 +14,8 @@ import ast from django import http as django_http -import mock import unittest +from unittest import mock from horizon import tables as hz_tables diff --git a/muranodashboard/tests/unit/environments/test_tabs.py b/muranodashboard/tests/unit/environments/test_tabs.py index 8d330ed9e..3694a0f17 100644 --- a/muranodashboard/tests/unit/environments/test_tabs.py +++ b/muranodashboard/tests/unit/environments/test_tabs.py @@ -13,8 +13,8 @@ # under the License. import collections -import mock import unittest +from unittest import mock from django.conf import settings from django.utils.translation import ugettext_lazy as _ diff --git a/muranodashboard/tests/unit/environments/test_topology.py b/muranodashboard/tests/unit/environments/test_topology.py index ea1dc1e0a..6b10408a9 100644 --- a/muranodashboard/tests/unit/environments/test_topology.py +++ b/muranodashboard/tests/unit/environments/test_topology.py @@ -13,7 +13,7 @@ # under the License. import json -import mock +from unittest import mock from muranodashboard.environments import consts from muranodashboard.environments import topology diff --git a/muranodashboard/tests/unit/environments/test_views.py b/muranodashboard/tests/unit/environments/test_views.py index 617316152..b9d08cb05 100644 --- a/muranodashboard/tests/unit/environments/test_views.py +++ b/muranodashboard/tests/unit/environments/test_views.py @@ -16,9 +16,9 @@ import base64 from django.conf import settings from django import http from django.utils.translation import ugettext_lazy as _ -import mock import sys import unittest +from unittest import mock from horizon import conf diff --git a/muranodashboard/tests/unit/images/test_forms.py b/muranodashboard/tests/unit/images/test_forms.py index bfa647504..52acadfb8 100644 --- a/muranodashboard/tests/unit/images/test_forms.py +++ b/muranodashboard/tests/unit/images/test_forms.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import unittest +from unittest import mock from django.utils.translation import ugettext_lazy as _ diff --git a/muranodashboard/tests/unit/images/test_views.py b/muranodashboard/tests/unit/images/test_views.py index a621fa960..b24589e52 100644 --- a/muranodashboard/tests/unit/images/test_views.py +++ b/muranodashboard/tests/unit/images/test_views.py @@ -13,8 +13,8 @@ # under the License. import json -import mock import unittest +from unittest import mock from horizon import exceptions diff --git a/muranodashboard/tests/unit/packages/test_api.py b/muranodashboard/tests/unit/packages/test_api.py index d399b5f81..8de93618a 100644 --- a/muranodashboard/tests/unit/packages/test_api.py +++ b/muranodashboard/tests/unit/packages/test_api.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from six import PY3 from muranoclient.v1 import client diff --git a/muranodashboard/tests/unit/packages/test_forms.py b/muranodashboard/tests/unit/packages/test_forms.py index 5f76711a1..55e4bdc31 100644 --- a/muranodashboard/tests/unit/packages/test_forms.py +++ b/muranodashboard/tests/unit/packages/test_forms.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from django import forms as django_forms diff --git a/muranodashboard/tests/unit/packages/test_tables.py b/muranodashboard/tests/unit/packages/test_tables.py index b4f939236..c3b5db87c 100644 --- a/muranodashboard/tests/unit/packages/test_tables.py +++ b/muranodashboard/tests/unit/packages/test_tables.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import unittest +from unittest import mock from django.utils.translation import ugettext_lazy as _ diff --git a/muranodashboard/tests/unit/packages/test_views.py b/muranodashboard/tests/unit/packages/test_views.py index c7dd9f708..d81f30bb8 100644 --- a/muranodashboard/tests/unit/packages/test_views.py +++ b/muranodashboard/tests/unit/packages/test_views.py @@ -15,8 +15,8 @@ from django.core.files import storage from django import http from django.utils.translation import ugettext_lazy as _ +from unittest import mock -import mock from horizon import exceptions as horizon_exceptions from muranoclient.common import exceptions as exc diff --git a/muranodashboard/tests/unit/test_api.py b/muranodashboard/tests/unit/test_api.py index 22a1383dc..b5519ca07 100644 --- a/muranodashboard/tests/unit/test_api.py +++ b/muranodashboard/tests/unit/test_api.py @@ -13,7 +13,7 @@ # under the License. -import mock +from unittest import mock from django.conf import settings diff --git a/requirements.txt b/requirements.txt index a8890179e..b26b2ae24 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,4 +15,4 @@ castellan>=0.18.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 semantic-version>=2.3.1 # BSD -horizon>=17.1.0 # Apache-2.0 +horizon>=18.3.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 192c63cdc..6ac0c9948 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,7 +9,6 @@ coverage!=4.4,>=4.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 selenium>=2.50.1 # Apache-2.0 -mock>=2.0.0 # BSD # Docs Requirements openstackdocstheme>=1.20.0 # Apache-2.0