Python 3: fix test_attributes

In Python 3, strings have an __iter__ method, which makes convert_to_list fail.

Change-Id: I2411ecd31d7d05ff6f0f004180edffc76d28573b
Blueprint: neutron-python3

diff --git a/neutron/api/v2/attributes.py b/neutron/api/v2/attributes.py
index 64a45e89105dba884a658e2073488c2a4639e545..6beb95b13a33f5b0f49b8dac9f2ad482460cefcb 100644 (file)
--- a/neutron/api/v2/attributes.py
+++ b/neutron/api/v2/attributes.py
@@ -578,7 +578,7 @@ def convert_none_to_empty_dict(value):
 def convert_to_list(data):
     if data is None:
         return []
-    elif hasattr(data, '__iter__'):
+    elif hasattr(data, '__iter__') and not isinstance(data, six.string_types):
         return list(data)
     else:
         return [data]

diff --git a/tox.ini b/tox.ini
index 37ddf17ccd01bd0974db0aa292bf7255cc8f8400..39870fb3978354516ab29c11094252b87941f8f2 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -174,6 +174,7 @@ commands = python -m testtools.run \
     neutron.tests.unit.api.rpc.handlers.test_securitygroups_rpc \
     neutron.tests.unit.api.rpc.handlers.test_dvr_rpc \
     neutron.tests.unit.api.rpc.agentnotifiers.test_dhcp_rpc_agent_api \
+    neutron.tests.unit.api.v2.test_attributes \
     neutron.tests.unit.agent.metadata.test_driver \
     neutron.tests.unit.agent.test_rpc \
     neutron.tests.unit.agent.test_securitygroups_rpc \