From 1d0eea7540b2449f836aff1adfe06c5d8f386113 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Mon, 3 Aug 2015 11:56:41 +0200 Subject: [PATCH] Python 3: Fix test_security_groups_db In Python 3, Exception() is not iterable. Change-Id: I89ffefeebb18f967129245936270318014f17f3f Blueprint: neutron-python3 --- neutron/callbacks/exceptions.py | 5 ++++- tox.ini | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/neutron/callbacks/exceptions.py b/neutron/callbacks/exceptions.py index f4cded227..96dbef52a 100644 --- a/neutron/callbacks/exceptions.py +++ b/neutron/callbacks/exceptions.py @@ -23,7 +23,10 @@ class CallbackFailure(Exception): self.errors = errors def __str__(self): - return ','.join(str(error) for error in self.errors) + if isinstance(self.errors, list): + return ','.join(str(error) for error in self.errors) + else: + return str(self.errors) class NotificationError(object): diff --git a/tox.ini b/tox.ini index 2d3b57408..f5094b0cc 100644 --- a/tox.ini +++ b/tox.ini @@ -160,6 +160,7 @@ commands = python -m testtools.run \ neutron.tests.unit.db.test_agents_db \ neutron.tests.unit.db.quota.test_driver \ neutron.tests.unit.db.test_dvr_mac_db \ + neutron.tests.unit.db.test_securitygroups_db \ neutron.tests.unit.debug.test_commands \ neutron.tests.unit.tests.test_post_mortem_debug \ neutron.tests.unit.tests.test_base \ -- 2.45.2