Merge "Python 3: fix neutron.tests.unit.agent.linux.test_async_process"
This commit is contained in:
commit
9d03b11837
|
@ -181,7 +181,10 @@ class AsyncProcess(object):
|
||||||
"""Kill the async process and respawn if necessary."""
|
"""Kill the async process and respawn if necessary."""
|
||||||
LOG.debug('Halting async process [%s] in response to an error.',
|
LOG.debug('Halting async process [%s] in response to an error.',
|
||||||
self.cmd)
|
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)
|
self._kill(respawning=respawning)
|
||||||
if respawning:
|
if respawning:
|
||||||
eventlet.sleep(self.respawn_interval)
|
eventlet.sleep(self.respawn_interval)
|
||||||
|
|
1
tox.ini
1
tox.ini
|
@ -201,6 +201,7 @@ commands = python -m testtools.run \
|
||||||
neutron.tests.unit.agent.linux.test_ip_monitor \
|
neutron.tests.unit.agent.linux.test_ip_monitor \
|
||||||
neutron.tests.unit.agent.linux.test_iptables_manager \
|
neutron.tests.unit.agent.linux.test_iptables_manager \
|
||||||
neutron.tests.unit.agent.linux.test_external_process \
|
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_ovsdb_monitor \
|
||||||
neutron.tests.unit.agent.linux.test_bridge_lib \
|
neutron.tests.unit.agent.linux.test_bridge_lib \
|
||||||
neutron.tests.unit.agent.linux.test_ip_link_support \
|
neutron.tests.unit.agent.linux.test_ip_link_support \
|
||||||
|
|
Loading…
Reference in New Issue