File 0001-Switch-over-to-mox3.patch of Package python-neutronclient
From 42b23f133fc274a0c3db21eceab6ee61cf7c069f Mon Sep 17 00:00:00 2001 From: Dirk Mueller <dirk@dmllr.de> Date: Thu, 13 Feb 2014 11:13:12 +0100 Subject: [PATCH] Switch over to mox3 mox3 is a Python 3.x compatible drop-in and allows to continue with the porting effort to Python 3.x with minimal code changes. Closes-Bug: #1283482 Change-Id: Ib052f1b87e312481e4c7c8d775ece94f53e7106b --- neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py | 2 +- neutronclient/tests/unit/lb/test_cli20_healthmonitor.py | 2 +- neutronclient/tests/unit/lb/test_cli20_pool.py | 2 +- neutronclient/tests/unit/test_auth.py | 2 +- neutronclient/tests/unit/test_cli20.py | 2 +- neutronclient/tests/unit/test_cli20_network.py | 2 +- neutronclient/tests/unit/test_cli20_port.py | 2 +- neutronclient/tests/unit/test_cli20_securitygroup.py | 2 +- neutronclient/tests/unit/test_http.py | 2 +- neutronclient/tests/unit/test_name_or_id.py | 2 +- neutronclient/tests/unit/test_shell.py | 2 +- neutronclient/tests/unit/test_ssl.py | 2 +- test-requirements.txt | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py b/neutronclient/tests/unit/fw/test_cli20_firewallpolicy.py index d217c91..8912c5e 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 ab2986e..09c5234 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 56def65..c293fa8 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 b81d236..6679c6f 100644 --- a/neutronclient/tests/unit/test_auth.py +++ b/neutronclient/tests/unit/test_auth.py @@ -19,7 +19,7 @@ import httplib2 import json import uuid -import mox +from mox3 import mox import testtools from neutronclient import client diff --git a/neutronclient/tests/unit/test_cli20.py b/neutronclient/tests/unit/test_cli20.py index b804dc8..4e8e941 100644 --- a/neutronclient/tests/unit/test_cli20.py +++ b/neutronclient/tests/unit/test_cli20.py @@ -17,7 +17,7 @@ import urllib import fixtures -import mox +from mox3 import mox import testtools from neutronclient.common import constants diff --git a/neutronclient/tests/unit/test_cli20_network.py b/neutronclient/tests/unit/test_cli20_network.py index 5e9be2a..1e1b9a9 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_port.py b/neutronclient/tests/unit/test_cli20_port.py index 0f41f24..ee43c75 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 3ffd023..e6127ff 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 1114f33..b623bd3 100644 --- a/neutronclient/tests/unit/test_http.py +++ b/neutronclient/tests/unit/test_http.py @@ -14,7 +14,7 @@ # under the License. import httplib2 -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 5866f32..7ddf804 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 23f1d2d..62ccf35 100644 --- a/neutronclient/tests/unit/test_shell.py +++ b/neutronclient/tests/unit/test_shell.py @@ -20,7 +20,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 0fefb78..e7fda22 100644 --- a/neutronclient/tests/unit/test_ssl.py +++ b/neutronclient/tests/unit/test_ssl.py @@ -15,7 +15,7 @@ import fixtures import httplib2 -import mox +from mox3 import mox import testtools from neutronclient.client import HTTPClient diff --git a/test-requirements.txt b/test-requirements.txt index 402590b..164fbf7 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 sphinx>=1.1.2,<1.2 testrepository>=0.0.17 -- 1.8.4.5
