diff --git a/horizon/test/helpers.py b/horizon/test/helpers.py index ebe0100c8e..aef0b44bd8 100644 --- a/horizon/test/helpers.py +++ b/horizon/test/helpers.py @@ -58,7 +58,7 @@ except ImportError as e: os.environ['WITH_SELENIUM'] = '' -import mox +from mox3 import mox from horizon import middleware diff --git a/horizon/test/tests/tables.py b/horizon/test/tests/tables.py index 104e3b18ca..1fdb84ae02 100644 --- a/horizon/test/tests/tables.py +++ b/horizon/test/tests/tables.py @@ -19,7 +19,7 @@ from django import http from django import shortcuts from django.template import defaultfilters -from mox import IsA # noqa +from mox3.mox import IsA # noqa from horizon import tables from horizon.tables import formset as table_formset diff --git a/openstack_dashboard/dashboards/admin/aggregates/tests.py b/openstack_dashboard/dashboards/admin/aggregates/tests.py index f24fec49d6..a716f1f87b 100644 --- a/openstack_dashboard/dashboards/admin/aggregates/tests.py +++ b/openstack_dashboard/dashboards/admin/aggregates/tests.py @@ -16,7 +16,7 @@ import mock from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.dashboards.admin.aggregates import constants diff --git a/openstack_dashboard/dashboards/admin/defaults/tests.py b/openstack_dashboard/dashboards/admin/defaults/tests.py index 8995674bab..6035a40853 100644 --- a/openstack_dashboard/dashboards/admin/defaults/tests.py +++ b/openstack_dashboard/dashboards/admin/defaults/tests.py @@ -14,7 +14,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/admin/flavors/tests.py b/openstack_dashboard/dashboards/admin/flavors/tests.py index 71daa45b07..b9922f9880 100644 --- a/openstack_dashboard/dashboards/admin/flavors/tests.py +++ b/openstack_dashboard/dashboards/admin/flavors/tests.py @@ -14,7 +14,7 @@ import json from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/admin/hypervisors/compute/tests.py b/openstack_dashboard/dashboards/admin/hypervisors/compute/tests.py index 9e8f4b3edc..7fd9311d73 100644 --- a/openstack_dashboard/dashboards/admin/hypervisors/compute/tests.py +++ b/openstack_dashboard/dashboards/admin/hypervisors/compute/tests.py @@ -12,7 +12,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/admin/hypervisors/tests.py b/openstack_dashboard/dashboards/admin/hypervisors/tests.py index e074368ec5..647e11e546 100644 --- a/openstack_dashboard/dashboards/admin/hypervisors/tests.py +++ b/openstack_dashboard/dashboards/admin/hypervisors/tests.py @@ -14,7 +14,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/admin/images/tests.py b/openstack_dashboard/dashboards/admin/images/tests.py index 09fd6189da..fc327b4932 100644 --- a/openstack_dashboard/dashboards/admin/images/tests.py +++ b/openstack_dashboard/dashboards/admin/images/tests.py @@ -19,7 +19,7 @@ from django.core.urlresolvers import reverse from django import http from django.test.utils import override_settings -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/admin/info/tests.py b/openstack_dashboard/dashboards/admin/info/tests.py index 2604a3aea6..83af327530 100644 --- a/openstack_dashboard/dashboards/admin/info/tests.py +++ b/openstack_dashboard/dashboards/admin/info/tests.py @@ -14,8 +14,8 @@ from django.core.urlresolvers import reverse from django import http -from mox import IgnoreArg # noqa -from mox import IsA # noqa +from mox3.mox import IgnoreArg # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/admin/instances/tests.py b/openstack_dashboard/dashboards/admin/instances/tests.py index 66b94e35e8..cc781e2245 100644 --- a/openstack_dashboard/dashboards/admin/instances/tests.py +++ b/openstack_dashboard/dashboards/admin/instances/tests.py @@ -18,8 +18,8 @@ from django.core.urlresolvers import reverse from django import http from django.utils.datastructures import SortedDict -from mox import IgnoreArg # noqa -from mox import IsA # noqa +from mox3.mox import IgnoreArg # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/admin/metadata_defs/tests.py b/openstack_dashboard/dashboards/admin/metadata_defs/tests.py index e1c6d74024..9fc5ee3717 100644 --- a/openstack_dashboard/dashboards/admin/metadata_defs/tests.py +++ b/openstack_dashboard/dashboards/admin/metadata_defs/tests.py @@ -19,7 +19,7 @@ import json from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.dashboards.admin.metadata_defs \ diff --git a/openstack_dashboard/dashboards/admin/metering/tests.py b/openstack_dashboard/dashboards/admin/metering/tests.py index e4b1ee5a6e..22197effcb 100644 --- a/openstack_dashboard/dashboards/admin/metering/tests.py +++ b/openstack_dashboard/dashboards/admin/metering/tests.py @@ -14,7 +14,7 @@ import json from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/admin/networks/tests.py b/openstack_dashboard/dashboards/admin/networks/tests.py index 764a070efd..0e7ddcea44 100644 --- a/openstack_dashboard/dashboards/admin/networks/tests.py +++ b/openstack_dashboard/dashboards/admin/networks/tests.py @@ -17,7 +17,7 @@ from django import http from horizon.workflows import views -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.dashboards.project.networks import tests diff --git a/openstack_dashboard/dashboards/admin/overview/tests.py b/openstack_dashboard/dashboards/admin/overview/tests.py index 84704c6b3e..2a7372cba3 100644 --- a/openstack_dashboard/dashboards/admin/overview/tests.py +++ b/openstack_dashboard/dashboards/admin/overview/tests.py @@ -23,7 +23,7 @@ from django import http from django.utils import encoding from django.utils import timezone -from mox import IsA # noqa +from mox3.mox import IsA # noqa from horizon.templatetags import sizeformat diff --git a/openstack_dashboard/dashboards/admin/routers/tests.py b/openstack_dashboard/dashboards/admin/routers/tests.py index 22eea0b9fd..530a8be437 100644 --- a/openstack_dashboard/dashboards/admin/routers/tests.py +++ b/openstack_dashboard/dashboards/admin/routers/tests.py @@ -15,8 +15,8 @@ from django.core.urlresolvers import reverse from django import http -from mox import IgnoreArg # noqa -from mox import IsA # noqa +from mox3.mox import IgnoreArg # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.dashboards.project.routers import tests as r_test diff --git a/openstack_dashboard/dashboards/admin/volumes/snapshots/tests.py b/openstack_dashboard/dashboards/admin/volumes/snapshots/tests.py index e9d76fb046..e6443feafc 100644 --- a/openstack_dashboard/dashboards/admin/volumes/snapshots/tests.py +++ b/openstack_dashboard/dashboards/admin/volumes/snapshots/tests.py @@ -12,7 +12,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard.api import cinder from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/admin/volumes/tests.py b/openstack_dashboard/dashboards/admin/volumes/tests.py index 4359025a88..e2af35152c 100644 --- a/openstack_dashboard/dashboards/admin/volumes/tests.py +++ b/openstack_dashboard/dashboards/admin/volumes/tests.py @@ -14,7 +14,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.api import cinder diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/extras/tests.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/extras/tests.py index c2a19fd05f..9c3d87fa6b 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/extras/tests.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/extras/tests.py @@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/tests.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/tests.py index ccf6afbae8..d2135919bb 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/tests.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/tests.py @@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/admin/volumes/volume_types/tests.py b/openstack_dashboard/dashboards/admin/volumes/volume_types/tests.py index 94ec8c69d9..df122acbdc 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volume_types/tests.py +++ b/openstack_dashboard/dashboards/admin/volumes/volume_types/tests.py @@ -12,7 +12,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.api import cinder diff --git a/openstack_dashboard/dashboards/admin/volumes/volumes/tests.py b/openstack_dashboard/dashboards/admin/volumes/volumes/tests.py index 1954e8b6a5..8652271927 100644 --- a/openstack_dashboard/dashboards/admin/volumes/volumes/tests.py +++ b/openstack_dashboard/dashboards/admin/volumes/volumes/tests.py @@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard.api import cinder from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/identity/domains/tests.py b/openstack_dashboard/dashboards/identity/domains/tests.py index 7cd6da3f2f..2708752079 100644 --- a/openstack_dashboard/dashboards/identity/domains/tests.py +++ b/openstack_dashboard/dashboards/identity/domains/tests.py @@ -16,8 +16,8 @@ from django.core.urlresolvers import reverse from django import http -from mox import IgnoreArg # noqa -from mox import IsA # noqa +from mox3.mox import IgnoreArg # noqa +from mox3.mox import IsA # noqa from horizon.workflows import views diff --git a/openstack_dashboard/dashboards/identity/groups/tests.py b/openstack_dashboard/dashboards/identity/groups/tests.py index 70f1718b09..2651d6bde6 100644 --- a/openstack_dashboard/dashboards/identity/groups/tests.py +++ b/openstack_dashboard/dashboards/identity/groups/tests.py @@ -15,8 +15,8 @@ from django.core.urlresolvers import reverse from django import http -from mox import IgnoreArg # noqa -from mox import IsA # noqa +from mox3.mox import IgnoreArg # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/identity/projects/tests.py b/openstack_dashboard/dashboards/identity/projects/tests.py index c74b14d724..e688276b47 100644 --- a/openstack_dashboard/dashboards/identity/projects/tests.py +++ b/openstack_dashboard/dashboards/identity/projects/tests.py @@ -24,8 +24,8 @@ from django.test.utils import override_settings from django.utils import timezone from django.utils import unittest -from mox import IgnoreArg # noqa -from mox import IsA # noqa +from mox3.mox import IgnoreArg # noqa +from mox3.mox import IsA # noqa from horizon import exceptions from horizon.workflows import views diff --git a/openstack_dashboard/dashboards/identity/roles/tests.py b/openstack_dashboard/dashboards/identity/roles/tests.py index 8cbb20f98e..5eabf7fc45 100644 --- a/openstack_dashboard/dashboards/identity/roles/tests.py +++ b/openstack_dashboard/dashboards/identity/roles/tests.py @@ -15,8 +15,8 @@ from django.core.urlresolvers import reverse from django import http -from mox import IgnoreArg # noqa -from mox import IsA # noqa +from mox3.mox import IgnoreArg # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/identity/users/tests.py b/openstack_dashboard/dashboards/identity/users/tests.py index d82997e38e..e513bb92de 100644 --- a/openstack_dashboard/dashboards/identity/users/tests.py +++ b/openstack_dashboard/dashboards/identity/users/tests.py @@ -22,8 +22,8 @@ from django.core.urlresolvers import reverse from django import http from django.test.utils import override_settings -from mox import IgnoreArg # noqa -from mox import IsA # noqa +from mox3.mox import IgnoreArg # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/access_and_security/api_access/tests.py b/openstack_dashboard/dashboards/project/access_and_security/api_access/tests.py index 4cf8745c33..1d0a4c8ba1 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/api_access/tests.py +++ b/openstack_dashboard/dashboards/project/access_and_security/api_access/tests.py @@ -15,7 +15,7 @@ from django.core.urlresolvers import reverse from django.http import HttpRequest # noqa -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/access_and_security/floating_ips/tests.py b/openstack_dashboard/dashboards/project/access_and_security/floating_ips/tests.py index fc09598201..f2e507f767 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/floating_ips/tests.py +++ b/openstack_dashboard/dashboards/project/access_and_security/floating_ips/tests.py @@ -21,7 +21,7 @@ from django.core.urlresolvers import reverse from django import http from django.utils.http import urlencode -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.dashboards.project.access_and_security \ diff --git a/openstack_dashboard/dashboards/project/access_and_security/keypairs/tests.py b/openstack_dashboard/dashboards/project/access_and_security/keypairs/tests.py index ea74d32c17..4cee6037c0 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/keypairs/tests.py +++ b/openstack_dashboard/dashboards/project/access_and_security/keypairs/tests.py @@ -19,7 +19,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.dashboards.project.access_and_security.\ diff --git a/openstack_dashboard/dashboards/project/access_and_security/security_groups/tests.py b/openstack_dashboard/dashboards/project/access_and_security/security_groups/tests.py index 395dbd2a9b..606171301f 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/security_groups/tests.py +++ b/openstack_dashboard/dashboards/project/access_and_security/security_groups/tests.py @@ -22,7 +22,7 @@ from django.conf import settings from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/access_and_security/tests.py b/openstack_dashboard/dashboards/project/access_and_security/tests.py index d30dd096ed..b1b5f4aa81 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/tests.py +++ b/openstack_dashboard/dashboards/project/access_and_security/tests.py @@ -20,7 +20,7 @@ from copy import deepcopy # noqa from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from horizon.workflows import views from openstack_dashboard import api diff --git a/openstack_dashboard/dashboards/project/containers/tests.py b/openstack_dashboard/dashboards/project/containers/tests.py index e1bb2879a4..2621d63281 100644 --- a/openstack_dashboard/dashboards/project/containers/tests.py +++ b/openstack_dashboard/dashboards/project/containers/tests.py @@ -24,7 +24,7 @@ from django.core.files.uploadedfile import InMemoryUploadedFile # noqa from django import http from django.utils import http as utils_http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.dashboards.project.containers import forms diff --git a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/tests.py b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/tests.py index 4700ef2d99..7682ee9de0 100644 --- a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/tests.py +++ b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/tests.py @@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/data_processing/clusters/tests.py b/openstack_dashboard/dashboards/project/data_processing/clusters/tests.py index 785d5e0e03..4b27cd44e5 100644 --- a/openstack_dashboard/dashboards/project/data_processing/clusters/tests.py +++ b/openstack_dashboard/dashboards/project/data_processing/clusters/tests.py @@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/data_processing/data_image_registry/tests.py b/openstack_dashboard/dashboards/project/data_processing/data_image_registry/tests.py index 4960995b4d..db4718c6d7 100644 --- a/openstack_dashboard/dashboards/project/data_processing/data_image_registry/tests.py +++ b/openstack_dashboard/dashboards/project/data_processing/data_image_registry/tests.py @@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/data_processing/data_plugins/tests.py b/openstack_dashboard/dashboards/project/data_processing/data_plugins/tests.py index 0c5f30d90f..d882c041d6 100644 --- a/openstack_dashboard/dashboards/project/data_processing/data_plugins/tests.py +++ b/openstack_dashboard/dashboards/project/data_processing/data_plugins/tests.py @@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/data_processing/data_sources/tests.py b/openstack_dashboard/dashboards/project/data_processing/data_sources/tests.py index d7a6afa834..301db5d5b8 100644 --- a/openstack_dashboard/dashboards/project/data_processing/data_sources/tests.py +++ b/openstack_dashboard/dashboards/project/data_processing/data_sources/tests.py @@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/data_processing/job_binaries/tests.py b/openstack_dashboard/dashboards/project/data_processing/job_binaries/tests.py index ef045b6329..a8f838b951 100644 --- a/openstack_dashboard/dashboards/project/data_processing/job_binaries/tests.py +++ b/openstack_dashboard/dashboards/project/data_processing/job_binaries/tests.py @@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/data_processing/job_executions/tests.py b/openstack_dashboard/dashboards/project/data_processing/job_executions/tests.py index 7ac90b9855..9885b9c467 100644 --- a/openstack_dashboard/dashboards/project/data_processing/job_executions/tests.py +++ b/openstack_dashboard/dashboards/project/data_processing/job_executions/tests.py @@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/data_processing/jobs/tests.py b/openstack_dashboard/dashboards/project/data_processing/jobs/tests.py index 5f5c2ec7dd..409258aec6 100644 --- a/openstack_dashboard/dashboards/project/data_processing/jobs/tests.py +++ b/openstack_dashboard/dashboards/project/data_processing/jobs/tests.py @@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/tests.py b/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/tests.py index 8f37531d7c..37327d1d9e 100644 --- a/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/tests.py +++ b/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/tests.py @@ -13,8 +13,8 @@ from django.core.urlresolvers import reverse from django import http -from mox import IgnoreArg # noqa -from mox import IsA # noqa +from mox3.mox import IgnoreArg # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.dashboards.project.data_processing.utils \ diff --git a/openstack_dashboard/dashboards/project/database_backups/tests.py b/openstack_dashboard/dashboards/project/database_backups/tests.py index c2a6330c5d..7f4ae7af81 100644 --- a/openstack_dashboard/dashboards/project/database_backups/tests.py +++ b/openstack_dashboard/dashboards/project/database_backups/tests.py @@ -14,7 +14,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/databases/tests.py b/openstack_dashboard/dashboards/project/databases/tests.py index 615a62bd26..7abefa8b6b 100644 --- a/openstack_dashboard/dashboards/project/databases/tests.py +++ b/openstack_dashboard/dashboards/project/databases/tests.py @@ -20,7 +20,7 @@ from django.core.urlresolvers import reverse from django import http from django.utils import unittest -from mox import IsA # noqa +from mox3.mox import IsA # noqa from horizon import exceptions from openstack_dashboard import api diff --git a/openstack_dashboard/dashboards/project/firewalls/tests.py b/openstack_dashboard/dashboards/project/firewalls/tests.py index 71e2e5ffcb..f4679bf63c 100644 --- a/openstack_dashboard/dashboards/project/firewalls/tests.py +++ b/openstack_dashboard/dashboards/project/firewalls/tests.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from mox import IsA # noqa +from mox3.mox import IsA # noqa from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse_lazy diff --git a/openstack_dashboard/dashboards/project/images/images/tests.py b/openstack_dashboard/dashboards/project/images/images/tests.py index 4e86468164..d2727dbe64 100644 --- a/openstack_dashboard/dashboards/project/images/images/tests.py +++ b/openstack_dashboard/dashboards/project/images/images/tests.py @@ -25,7 +25,7 @@ from django.forms.widgets import HiddenInput # noqa from django import http from django.test.utils import override_settings -from mox import IsA # noqa +from mox3.mox import IsA # noqa from horizon import tables as horizon_tables from openstack_dashboard import api diff --git a/openstack_dashboard/dashboards/project/images/snapshots/tests.py b/openstack_dashboard/dashboards/project/images/snapshots/tests.py index 0de05dcac0..92f13b4a41 100644 --- a/openstack_dashboard/dashboards/project/images/snapshots/tests.py +++ b/openstack_dashboard/dashboards/project/images/snapshots/tests.py @@ -19,7 +19,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/images/tests.py b/openstack_dashboard/dashboards/project/images/tests.py index 913167234d..118a342d15 100644 --- a/openstack_dashboard/dashboards/project/images/tests.py +++ b/openstack_dashboard/dashboards/project/images/tests.py @@ -22,7 +22,7 @@ from socket import timeout as socket_timeout # noqa from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from horizon import exceptions diff --git a/openstack_dashboard/dashboards/project/instances/tests.py b/openstack_dashboard/dashboards/project/instances/tests.py index d57c49d104..6ec4b7919a 100644 --- a/openstack_dashboard/dashboards/project/instances/tests.py +++ b/openstack_dashboard/dashboards/project/instances/tests.py @@ -27,8 +27,8 @@ import django.test from django.utils.datastructures import SortedDict from django.utils import encoding from django.utils.http import urlencode -from mox import IgnoreArg # noqa -from mox import IsA # noqa +from mox3.mox import IgnoreArg # noqa +from mox3.mox import IsA # noqa from horizon import exceptions from horizon import forms diff --git a/openstack_dashboard/dashboards/project/loadbalancers/tests.py b/openstack_dashboard/dashboards/project/loadbalancers/tests.py index 8089216716..4186e2749e 100644 --- a/openstack_dashboard/dashboards/project/loadbalancers/tests.py +++ b/openstack_dashboard/dashboards/project/loadbalancers/tests.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from mox import IsA # noqa +from mox3.mox import IsA # noqa from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse_lazy diff --git a/openstack_dashboard/dashboards/project/network_topology/tests.py b/openstack_dashboard/dashboards/project/network_topology/tests.py index b2ee3c8806..15214e9474 100644 --- a/openstack_dashboard/dashboards/project/network_topology/tests.py +++ b/openstack_dashboard/dashboards/project/network_topology/tests.py @@ -18,7 +18,7 @@ from django.core.urlresolvers import reverse from django import http import django.test -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/networks/tests.py b/openstack_dashboard/dashboards/project/networks/tests.py index 7441bf83c0..81c517242d 100644 --- a/openstack_dashboard/dashboards/project/networks/tests.py +++ b/openstack_dashboard/dashboards/project/networks/tests.py @@ -18,7 +18,7 @@ from django.utils.html import escape from horizon.workflows import views -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.dashboards.project.networks.subnets import tables\ diff --git a/openstack_dashboard/dashboards/project/overview/tests.py b/openstack_dashboard/dashboards/project/overview/tests.py index 043f57ba17..97ae955de9 100644 --- a/openstack_dashboard/dashboards/project/overview/tests.py +++ b/openstack_dashboard/dashboards/project/overview/tests.py @@ -22,7 +22,7 @@ from django.core.urlresolvers import reverse from django import http from django.utils import timezone -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/routers/tests.py b/openstack_dashboard/dashboards/project/routers/tests.py index 7260b11e34..56f1736e31 100644 --- a/openstack_dashboard/dashboards/project/routers/tests.py +++ b/openstack_dashboard/dashboards/project/routers/tests.py @@ -16,8 +16,8 @@ import copy from django.core.urlresolvers import reverse from django import http -from mox import IgnoreArg # noqa -from mox import IsA # noqa +from mox3.mox import IgnoreArg # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.dashboards.project.routers.extensions.routerrules\ diff --git a/openstack_dashboard/dashboards/project/stacks/resource_types/tests.py b/openstack_dashboard/dashboards/project/stacks/resource_types/tests.py index 96e8665c0f..02c8dcb09b 100644 --- a/openstack_dashboard/dashboards/project/stacks/resource_types/tests.py +++ b/openstack_dashboard/dashboards/project/stacks/resource_types/tests.py @@ -14,7 +14,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/stacks/tests.py b/openstack_dashboard/dashboards/project/stacks/tests.py index 723d402396..5b3c52cc0e 100644 --- a/openstack_dashboard/dashboards/project/stacks/tests.py +++ b/openstack_dashboard/dashboards/project/stacks/tests.py @@ -21,7 +21,7 @@ from django import http from django.test.utils import override_settings # noqa from django.utils import html -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/volumes/backups/tests.py b/openstack_dashboard/dashboards/project/volumes/backups/tests.py index 22ca003445..05f4069243 100644 --- a/openstack_dashboard/dashboards/project/volumes/backups/tests.py +++ b/openstack_dashboard/dashboards/project/volumes/backups/tests.py @@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse from django import http from django.utils.http import urlencode -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/volumes/snapshots/tests.py b/openstack_dashboard/dashboards/project/volumes/snapshots/tests.py index ab46569956..0643e7a527 100644 --- a/openstack_dashboard/dashboards/project/volumes/snapshots/tests.py +++ b/openstack_dashboard/dashboards/project/volumes/snapshots/tests.py @@ -18,7 +18,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.api import cinder diff --git a/openstack_dashboard/dashboards/project/volumes/test.py b/openstack_dashboard/dashboards/project/volumes/test.py index 23157d038a..333669a920 100644 --- a/openstack_dashboard/dashboards/project/volumes/test.py +++ b/openstack_dashboard/dashboards/project/volumes/test.py @@ -15,7 +15,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/project/volumes/volumes/tests.py b/openstack_dashboard/dashboards/project/volumes/volumes/tests.py index b1b9a6291c..7ded9d512d 100644 --- a/openstack_dashboard/dashboards/project/volumes/volumes/tests.py +++ b/openstack_dashboard/dashboards/project/volumes/volumes/tests.py @@ -22,7 +22,7 @@ from django.forms import widgets from django import http from django.test.utils import override_settings -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.api import cinder diff --git a/openstack_dashboard/dashboards/project/vpn/tests.py b/openstack_dashboard/dashboards/project/vpn/tests.py index 58527ecc88..97a15d2732 100644 --- a/openstack_dashboard/dashboards/project/vpn/tests.py +++ b/openstack_dashboard/dashboards/project/vpn/tests.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from mox import IsA # noqa +from mox3.mox import IsA # noqa from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse_lazy diff --git a/openstack_dashboard/dashboards/router/nexus1000v/tests.py b/openstack_dashboard/dashboards/router/nexus1000v/tests.py index 598355e199..aaa5bbe6e8 100644 --- a/openstack_dashboard/dashboards/router/nexus1000v/tests.py +++ b/openstack_dashboard/dashboards/router/nexus1000v/tests.py @@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/dashboards/settings/password/tests.py b/openstack_dashboard/dashboards/settings/password/tests.py index 4f167df111..7513688bef 100644 --- a/openstack_dashboard/dashboards/settings/password/tests.py +++ b/openstack_dashboard/dashboards/settings/password/tests.py @@ -19,7 +19,7 @@ from django import http from django.utils.six.moves.urllib.parse import urlsplit # noqa from django.utils import unittest -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/test/api_tests/ceilometer_tests.py b/openstack_dashboard/test/api_tests/ceilometer_tests.py index 36e553ee21..55caa83d06 100644 --- a/openstack_dashboard/test/api_tests/ceilometer_tests.py +++ b/openstack_dashboard/test/api_tests/ceilometer_tests.py @@ -14,7 +14,7 @@ from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/test/api_tests/network_tests.py b/openstack_dashboard/test/api_tests/network_tests.py index 7d432147fb..72b915cf6c 100644 --- a/openstack_dashboard/test/api_tests/network_tests.py +++ b/openstack_dashboard/test/api_tests/network_tests.py @@ -19,7 +19,7 @@ import uuid from django import http from django.test.utils import override_settings -from mox import IsA # noqa +from mox3.mox import IsA # noqa from novaclient.v2 import floating_ip_pools diff --git a/openstack_dashboard/test/api_tests/nova_tests.py b/openstack_dashboard/test/api_tests/nova_tests.py index 7b360ef2ce..8352fcc7b5 100644 --- a/openstack_dashboard/test/api_tests/nova_tests.py +++ b/openstack_dashboard/test/api_tests/nova_tests.py @@ -23,7 +23,7 @@ from django.conf import settings from django import http from django.test.utils import override_settings -from mox import IsA # noqa +from mox3.mox import IsA # noqa from novaclient import exceptions as nova_exceptions from novaclient.v2 import servers import six diff --git a/openstack_dashboard/test/api_tests/swift_tests.py b/openstack_dashboard/test/api_tests/swift_tests.py index 3f244dc30b..f2d96e851a 100644 --- a/openstack_dashboard/test/api_tests/swift_tests.py +++ b/openstack_dashboard/test/api_tests/swift_tests.py @@ -18,7 +18,7 @@ from __future__ import absolute_import -from mox import IsA # noqa +from mox3.mox import IsA # noqa from horizon import exceptions diff --git a/openstack_dashboard/test/helpers.py b/openstack_dashboard/test/helpers.py index c738885429..63051bfff6 100644 --- a/openstack_dashboard/test/helpers.py +++ b/openstack_dashboard/test/helpers.py @@ -38,7 +38,7 @@ from heatclient import client as heat_client import httplib2 from keystoneclient.v2_0 import client as keystone_client import mock -import mox +from mox3 import mox from neutronclient.v2_0 import client as neutron_client from novaclient.v2 import client as nova_client from openstack_auth import user diff --git a/openstack_dashboard/test/tests/quotas.py b/openstack_dashboard/test/tests/quotas.py index 294fe367d0..1a18bb2cd2 100644 --- a/openstack_dashboard/test/tests/quotas.py +++ b/openstack_dashboard/test/tests/quotas.py @@ -20,7 +20,7 @@ from __future__ import absolute_import from django import http -from mox import IsA # noqa +from mox3.mox import IsA # noqa from openstack_dashboard import api from openstack_dashboard.api import cinder diff --git a/test-requirements.txt b/test-requirements.txt index 173c769d6b..3f3b0e6400 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,7 +13,7 @@ coverage>=3.6 django-nose>=1.2 mock>=1.1;python_version!='2.6' mock==1.0.1;python_version=='2.6' -mox>=0.5.3 +mox3>=0.7.0 nodeenv>=0.9.4 # BSD License nose nose-exclude