diff --git a/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py b/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py index d217c91ce..8912c5e22 100644 --- a/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py +++ b/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py @@ -18,7 +18,7 @@ import sys -import mox +from mox3 import mox from neutronclient.neutron.v2_0.fw import firewallpolicy from neutronclient import shell diff --git a/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py b/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py index ab2986e43..09c5234c6 100644 --- a/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py +++ b/neutronclient/tests/unit/lb/test_cli20_healthmonitor.py @@ -18,7 +18,7 @@ import sys -import mox +from mox3 import mox from neutronclient.neutron.v2_0.lb import healthmonitor from neutronclient.tests.unit import test_cli20 diff --git a/neutronclient/tests/unit/lb/test_cli20_pool.py b/neutronclient/tests/unit/lb/test_cli20_pool.py index 56def65af..c293fa87f 100644 --- a/neutronclient/tests/unit/lb/test_cli20_pool.py +++ b/neutronclient/tests/unit/lb/test_cli20_pool.py @@ -18,7 +18,7 @@ import sys -import mox +from mox3 import mox from neutronclient.neutron.v2_0.lb import pool from neutronclient.tests.unit import test_cli20 diff --git a/neutronclient/tests/unit/test_auth.py b/neutronclient/tests/unit/test_auth.py index ae077c8ad..34ef71d4e 100644 --- a/neutronclient/tests/unit/test_auth.py +++ b/neutronclient/tests/unit/test_auth.py @@ -19,7 +19,7 @@ import json import uuid from keystoneclient import exceptions as k_exceptions -import mox +from mox3 import mox import requests import testtools diff --git a/neutronclient/tests/unit/test_cli20.py b/neutronclient/tests/unit/test_cli20.py index 71130111e..7ceb5cc86 100644 --- a/neutronclient/tests/unit/test_cli20.py +++ b/neutronclient/tests/unit/test_cli20.py @@ -19,7 +19,7 @@ import urllib import contextlib import cStringIO import fixtures -import mox +from mox3 import mox import requests import sys import testtools diff --git a/neutronclient/tests/unit/test_cli20_network.py b/neutronclient/tests/unit/test_cli20_network.py index 5e9be2a69..1e1b9a9fe 100644 --- a/neutronclient/tests/unit/test_cli20_network.py +++ b/neutronclient/tests/unit/test_cli20_network.py @@ -15,7 +15,7 @@ import sys -import mox +from mox3 import mox from neutronclient.common import exceptions from neutronclient.common import utils diff --git a/neutronclient/tests/unit/test_cli20_nsx_networkgateway.py b/neutronclient/tests/unit/test_cli20_nsx_networkgateway.py index 9db388faa..8a52a281c 100644 --- a/neutronclient/tests/unit/test_cli20_nsx_networkgateway.py +++ b/neutronclient/tests/unit/test_cli20_nsx_networkgateway.py @@ -16,7 +16,7 @@ import sys -import mox +from mox3 import mox from neutronclient.neutron.v2_0.nsx import networkgateway as nwgw from neutronclient.tests.unit import test_cli20 diff --git a/neutronclient/tests/unit/test_cli20_packetfilter.py b/neutronclient/tests/unit/test_cli20_packetfilter.py index 2cb78e6e2..9d7546d96 100644 --- a/neutronclient/tests/unit/test_cli20_packetfilter.py +++ b/neutronclient/tests/unit/test_cli20_packetfilter.py @@ -15,7 +15,7 @@ import sys -import mox +from mox3 import mox from neutronclient.common import exceptions from neutronclient.neutron.v2_0.nec import packetfilter as pf diff --git a/neutronclient/tests/unit/test_cli20_port.py b/neutronclient/tests/unit/test_cli20_port.py index 0f41f247f..ee43c7568 100644 --- a/neutronclient/tests/unit/test_cli20_port.py +++ b/neutronclient/tests/unit/test_cli20_port.py @@ -16,7 +16,7 @@ import sys -import mox +from mox3 import mox from neutronclient.neutron.v2_0 import port from neutronclient import shell diff --git a/neutronclient/tests/unit/test_cli20_securitygroup.py b/neutronclient/tests/unit/test_cli20_securitygroup.py index 3ffd0232b..e6127ff9b 100644 --- a/neutronclient/tests/unit/test_cli20_securitygroup.py +++ b/neutronclient/tests/unit/test_cli20_securitygroup.py @@ -16,7 +16,7 @@ import sys -import mox +from mox3 import mox from neutronclient.neutron.v2_0 import securitygroup from neutronclient.tests.unit import test_cli20 diff --git a/neutronclient/tests/unit/test_http.py b/neutronclient/tests/unit/test_http.py index 77a3a4a75..f2a6675a5 100644 --- a/neutronclient/tests/unit/test_http.py +++ b/neutronclient/tests/unit/test_http.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mox +from mox3 import mox import testtools from neutronclient.client import HTTPClient diff --git a/neutronclient/tests/unit/test_name_or_id.py b/neutronclient/tests/unit/test_name_or_id.py index 5866f3209..7ddf80428 100644 --- a/neutronclient/tests/unit/test_name_or_id.py +++ b/neutronclient/tests/unit/test_name_or_id.py @@ -16,7 +16,7 @@ import uuid -import mox +from mox3 import mox import testtools from neutronclient.common import exceptions diff --git a/neutronclient/tests/unit/test_shell.py b/neutronclient/tests/unit/test_shell.py index 9c50fe938..b0bb82af1 100644 --- a/neutronclient/tests/unit/test_shell.py +++ b/neutronclient/tests/unit/test_shell.py @@ -21,7 +21,7 @@ import re import sys import fixtures -import mox +from mox3 import mox import testtools from testtools import matchers diff --git a/neutronclient/tests/unit/test_ssl.py b/neutronclient/tests/unit/test_ssl.py index 91d052589..be6e3a2dd 100644 --- a/neutronclient/tests/unit/test_ssl.py +++ b/neutronclient/tests/unit/test_ssl.py @@ -14,7 +14,7 @@ # under the License. import fixtures -import mox +from mox3 import mox import requests import testtools diff --git a/test-requirements.txt b/test-requirements.txt index 402590b90..164fbf7cc 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,7 @@ cliff-tablib>=1.0 coverage>=3.6 discover fixtures>=0.3.14 -mox>=0.5.3 +mox3>=0.7.0 python-subunit>=0.0.18 sphinx>=1.1.2,<1.2 testrepository>=0.0.18