openstack
/
neutron
Code Issues Proposed changes

Merge "Increase TestDhcpAgentHA.agent_down_time to 30 seconds" into stable/stein

This commit is contained in:
Zuul 2019-09-10 10:15:57 +00:00 committed by Gerrit Code Review
parent e0f498aae9 5b07cb21e3
commit 3f5c61bd0a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/tests/fullstack/resources/config.py
View File

@ -83,7 +83,8 @@ class NeutronConfigFixture(ConfigFixture):
'lock_path': '$state_path/lock', 'lock_path': '$state_path/lock',
}, },
'agent': { 'agent': {
'report_interval': str(env_desc.agent_down_time / 2.0) 'report_interval': str(env_desc.agent_down_time / 2.0),
'log_agent_heartbeats': 'True',
}, },
}) })
policy_file = self._generate_policy_json() policy_file = self._generate_policy_json()

2
neutron/tests/fullstack/test_dhcp_agent.py
View File

@ -124,7 +124,7 @@ class TestDhcpAgentNoHA(BaseDhcpAgentTest):
class TestDhcpAgentHA(BaseDhcpAgentTest): class TestDhcpAgentHA(BaseDhcpAgentTest):
number_of_hosts = 2 number_of_hosts = 2
agent_down_time = 10 agent_down_time = 30
def _wait_until_network_rescheduled(self, old_agent): def _wait_until_network_rescheduled(self, old_agent):
def _agent_rescheduled(): def _agent_rescheduled():