Use unittest.mock instead of third party mock

Following openstack horizon change
I2de669d8e89b8daeb7ee5405ffab35af6307c40b

Now that we no longer support py27, we can use the standard library
unittest.mock module instead of the third party mock lib.

Unblocks currently broken pyX gates

Change-Id: Id140c0a13c9d2a2bfcd1d851a04407f232021eef
Closes-Bug: #1870436
This commit is contained in:
Victoria Martinez de la Cruz 2020-04-03 15:26:46 +00:00
parent e1bcac22ac
commit 8dae688801
24 changed files with 23 additions and 24 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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