diff --git a/manila_ui/tests/dashboards/admin/security_services/tests.py b/manila_ui/tests/dashboards/admin/security_services/tests.py index 177bf5aa..7ee3c5b0 100644 --- a/manila_ui/tests/dashboards/admin/security_services/tests.py +++ b/manila_ui/tests/dashboards/admin/security_services/tests.py @@ -15,8 +15,8 @@ from django.urls import reverse from horizon import exceptions as horizon_exceptions -import mock from openstack_dashboard.api import keystone as api_keystone +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.dashboards.admin import utils diff --git a/manila_ui/tests/dashboards/admin/share_group_snapshots/tests.py b/manila_ui/tests/dashboards/admin/share_group_snapshots/tests.py index c9be801d..3bed20e3 100644 --- a/manila_ui/tests/dashboards/admin/share_group_snapshots/tests.py +++ b/manila_ui/tests/dashboards/admin/share_group_snapshots/tests.py @@ -15,7 +15,7 @@ import ddt from django.urls import reverse -import mock +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.tests.dashboards.project import test_data diff --git a/manila_ui/tests/dashboards/admin/share_group_types/tests.py b/manila_ui/tests/dashboards/admin/share_group_types/tests.py index 29fd87a7..121f7b67 100644 --- a/manila_ui/tests/dashboards/admin/share_group_types/tests.py +++ b/manila_ui/tests/dashboards/admin/share_group_types/tests.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. from django.urls import reverse -import mock +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.tests.dashboards.project import test_data diff --git a/manila_ui/tests/dashboards/admin/share_groups/tests.py b/manila_ui/tests/dashboards/admin/share_groups/tests.py index a89749c8..d06ba3a3 100644 --- a/manila_ui/tests/dashboards/admin/share_groups/tests.py +++ b/manila_ui/tests/dashboards/admin/share_groups/tests.py @@ -15,7 +15,7 @@ import ddt from django.urls import reverse -import mock +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.tests.dashboards.project import test_data diff --git a/manila_ui/tests/dashboards/admin/share_instances/tests.py b/manila_ui/tests/dashboards/admin/share_instances/tests.py index 04f62ecc..df195934 100644 --- a/manila_ui/tests/dashboards/admin/share_instances/tests.py +++ b/manila_ui/tests/dashboards/admin/share_instances/tests.py @@ -15,8 +15,8 @@ from django.urls import reverse from horizon import exceptions as horizon_exceptions -import mock from openstack_dashboard.api import keystone as api_keystone +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.tests.dashboards.project import test_data diff --git a/manila_ui/tests/dashboards/admin/share_networks/tests.py b/manila_ui/tests/dashboards/admin/share_networks/tests.py index 2ff2febb..217fd193 100644 --- a/manila_ui/tests/dashboards/admin/share_networks/tests.py +++ b/manila_ui/tests/dashboards/admin/share_networks/tests.py @@ -15,10 +15,10 @@ from django.urls import reverse from horizon import exceptions as horizon_exceptions -import mock from neutronclient.client import exceptions from openstack_dashboard.api import keystone as api_keystone from openstack_dashboard.api import neutron as api_neutron +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.dashboards.admin import utils diff --git a/manila_ui/tests/dashboards/admin/share_servers/tests.py b/manila_ui/tests/dashboards/admin/share_servers/tests.py index 0e9edee1..5eef7c2e 100644 --- a/manila_ui/tests/dashboards/admin/share_servers/tests.py +++ b/manila_ui/tests/dashboards/admin/share_servers/tests.py @@ -15,8 +15,8 @@ from django.urls import reverse from horizon import exceptions as horizon_exceptions -import mock from openstack_dashboard.api import keystone as api_keystone +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.tests.dashboards.project import test_data diff --git a/manila_ui/tests/dashboards/admin/share_snapshots/tests.py b/manila_ui/tests/dashboards/admin/share_snapshots/tests.py index 2a5a8e58..4b777df7 100644 --- a/manila_ui/tests/dashboards/admin/share_snapshots/tests.py +++ b/manila_ui/tests/dashboards/admin/share_snapshots/tests.py @@ -15,8 +15,8 @@ from django.urls import reverse from horizon import exceptions as horizon_exceptions -import mock from openstack_dashboard.api import keystone as api_keystone +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.dashboards.admin import utils diff --git a/manila_ui/tests/dashboards/admin/share_types/test_forms.py b/manila_ui/tests/dashboards/admin/share_types/test_forms.py index 7ba760a0..9478f7d6 100644 --- a/manila_ui/tests/dashboards/admin/share_types/test_forms.py +++ b/manila_ui/tests/dashboards/admin/share_types/test_forms.py @@ -17,7 +17,7 @@ import ddt from django.core.handlers import wsgi from django import forms as django_forms from horizon import forms as horizon_forms -import mock +from unittest import mock from manila_ui.dashboards.admin.share_types import forms from manila_ui.tests import helpers as base diff --git a/manila_ui/tests/dashboards/admin/share_types/tests.py b/manila_ui/tests/dashboards/admin/share_types/tests.py index ba15386e..719220f7 100644 --- a/manila_ui/tests/dashboards/admin/share_types/tests.py +++ b/manila_ui/tests/dashboards/admin/share_types/tests.py @@ -14,9 +14,9 @@ # under the License. from django.urls import reverse -import mock from openstack_dashboard.api import keystone as api_keystone from openstack_dashboard.api import neutron as api_neutron +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.dashboards.admin import utils diff --git a/manila_ui/tests/dashboards/admin/shares/replicas/tests.py b/manila_ui/tests/dashboards/admin/shares/replicas/tests.py index da9e6e7d..1f241b27 100644 --- a/manila_ui/tests/dashboards/admin/shares/replicas/tests.py +++ b/manila_ui/tests/dashboards/admin/shares/replicas/tests.py @@ -14,7 +14,7 @@ import ddt from django.urls import reverse -import mock +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.tests.dashboards.project import test_data diff --git a/manila_ui/tests/dashboards/admin/shares/test_forms.py b/manila_ui/tests/dashboards/admin/shares/test_forms.py index 248978b8..a965f6f3 100644 --- a/manila_ui/tests/dashboards/admin/shares/test_forms.py +++ b/manila_ui/tests/dashboards/admin/shares/test_forms.py @@ -14,7 +14,7 @@ # under the License. from django.core.handlers import wsgi -import mock +from unittest import mock from manila_ui.api import manila as api from manila_ui.dashboards.admin.shares import forms diff --git a/manila_ui/tests/dashboards/admin/shares/tests.py b/manila_ui/tests/dashboards/admin/shares/tests.py index 103ff04b..8c4a5d1c 100644 --- a/manila_ui/tests/dashboards/admin/shares/tests.py +++ b/manila_ui/tests/dashboards/admin/shares/tests.py @@ -15,9 +15,9 @@ import ddt from django.urls import reverse -import mock from openstack_dashboard.api import keystone as api_keystone from openstack_dashboard.api import neutron as api_neutron +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.dashboards.admin import utils diff --git a/manila_ui/tests/dashboards/project/security_services/tests.py b/manila_ui/tests/dashboards/project/security_services/tests.py index a183ccc4..f6066229 100644 --- a/manila_ui/tests/dashboards/project/security_services/tests.py +++ b/manila_ui/tests/dashboards/project/security_services/tests.py @@ -18,8 +18,8 @@ from django.urls import reverse from horizon import exceptions as horizon_exceptions -import mock from openstack_dashboard import api +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.tests.dashboards.project import test_data diff --git a/manila_ui/tests/dashboards/project/share_group_snapshots/tests.py b/manila_ui/tests/dashboards/project/share_group_snapshots/tests.py index 6e158445..1d4516b9 100644 --- a/manila_ui/tests/dashboards/project/share_group_snapshots/tests.py +++ b/manila_ui/tests/dashboards/project/share_group_snapshots/tests.py @@ -15,7 +15,7 @@ import ddt from django.urls import reverse -import mock +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.tests.dashboards.project import test_data diff --git a/manila_ui/tests/dashboards/project/share_groups/tests.py b/manila_ui/tests/dashboards/project/share_groups/tests.py index 01e0686e..de10b193 100644 --- a/manila_ui/tests/dashboards/project/share_groups/tests.py +++ b/manila_ui/tests/dashboards/project/share_groups/tests.py @@ -15,7 +15,7 @@ import ddt from django.urls import reverse -import mock +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.tests.dashboards.project import test_data diff --git a/manila_ui/tests/dashboards/project/share_networks/tests.py b/manila_ui/tests/dashboards/project/share_networks/tests.py index 64cc2cfd..ee305694 100644 --- a/manila_ui/tests/dashboards/project/share_networks/tests.py +++ b/manila_ui/tests/dashboards/project/share_networks/tests.py @@ -13,10 +13,10 @@ # under the License. from django.urls import reverse -import mock from neutronclient.client import exceptions from openstack_auth import policy from openstack_dashboard import api +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.api import network as api_manila_network diff --git a/manila_ui/tests/dashboards/project/share_snapshots/test_tables.py b/manila_ui/tests/dashboards/project/share_snapshots/test_tables.py index 25780ff4..c6757daa 100644 --- a/manila_ui/tests/dashboards/project/share_snapshots/test_tables.py +++ b/manila_ui/tests/dashboards/project/share_snapshots/test_tables.py @@ -15,7 +15,7 @@ import ddt from django.core.handlers import wsgi -import mock +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.dashboards.project.share_snapshots import tables diff --git a/manila_ui/tests/dashboards/project/share_snapshots/tests.py b/manila_ui/tests/dashboards/project/share_snapshots/tests.py index c58da54b..ad73d76e 100644 --- a/manila_ui/tests/dashboards/project/share_snapshots/tests.py +++ b/manila_ui/tests/dashboards/project/share_snapshots/tests.py @@ -14,8 +14,8 @@ import ddt from django.urls import reverse -import mock from openstack_dashboard.api import neutron +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.tests.dashboards.project import test_data diff --git a/manila_ui/tests/dashboards/project/shares/replicas/tests.py b/manila_ui/tests/dashboards/project/shares/replicas/tests.py index 4f1f9765..8c1aa055 100644 --- a/manila_ui/tests/dashboards/project/shares/replicas/tests.py +++ b/manila_ui/tests/dashboards/project/shares/replicas/tests.py @@ -14,8 +14,8 @@ import ddt from django.urls import reverse -import mock from openstack_dashboard.api import neutron +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.dashboards.project.shares.replicas import tables as r_tables diff --git a/manila_ui/tests/dashboards/project/shares/tests.py b/manila_ui/tests/dashboards/project/shares/tests.py index 0a833f82..36c36895 100644 --- a/manila_ui/tests/dashboards/project/shares/tests.py +++ b/manila_ui/tests/dashboards/project/shares/tests.py @@ -16,8 +16,8 @@ import ddt from django.core.handlers import wsgi from django.urls import reverse from horizon import messages as horizon_messages -import mock from openstack_dashboard.api import neutron +from unittest import mock from manila_ui.api import manila as api_manila from manila_ui.dashboards.project.shares import forms diff --git a/manila_ui/tests/dashboards/project/tests.py b/manila_ui/tests/dashboards/project/tests.py index ada18694..30a8f072 100644 --- a/manila_ui/tests/dashboards/project/tests.py +++ b/manila_ui/tests/dashboards/project/tests.py @@ -14,7 +14,7 @@ from django.urls import reverse from django.utils import translation -import mock +from unittest import mock from manila_ui.dashboards.project import shares from manila_ui.tests import helpers as test diff --git a/manila_ui/tests/helpers.py b/manila_ui/tests/helpers.py index e32dcaac..3e4f12ee 100644 --- a/manila_ui/tests/helpers.py +++ b/manila_ui/tests/helpers.py @@ -11,9 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import os import unittest +from unittest import mock from manila_ui import api from manila_ui.tests.test_data import utils diff --git a/test-requirements.txt b/test-requirements.txt index 8046e379..4dfa1c99 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,6 @@ hacking>=1.1.0,<1.2.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 ddt>=1.0.1 # MIT -mock>=2.0.0 # BSD python-subunit>=1.0.0 # Apache-2.0/BSD sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD