openstack
/
neutron
Code Issues Proposed changes

Merge "Python 3: fix neutron.tests.unit.agent.linux.test_async_process"

This commit is contained in:
Jenkins 2015-07-23 14:12:06 +00:00 committed by Gerrit Code Review
parent eb280d769e 6226fb73a4
commit 9d03b11837
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/agent/linux/async_process.py
View File

@ -181,7 +181,10 @@ class AsyncProcess(object):
"""Kill the async process and respawn if necessary."""
LOG.debug('Halting async process [%s] in response to an error.',
self.cmd)
respawning = self.respawn_interval >= 0
if self.respawn_interval is not None and self.respawn_interval >= 0:
respawning = True
else:
respawning = False
self._kill(respawning=respawning)
if respawning:
eventlet.sleep(self.respawn_interval)

1
tox.ini
View File

@ -201,6 +201,7 @@ commands = python -m testtools.run \
neutron.tests.unit.agent.linux.test_ip_monitor \
neutron.tests.unit.agent.linux.test_iptables_manager \
neutron.tests.unit.agent.linux.test_external_process \
neutron.tests.unit.agent.linux.test_async_process \
neutron.tests.unit.agent.linux.test_ovsdb_monitor \
neutron.tests.unit.agent.linux.test_bridge_lib \
neutron.tests.unit.agent.linux.test_ip_link_support \