Browse Source

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

stable/rocky
Zuul 6 days ago
parent
commit
6f379a9349

+ 2
- 1
neutron/tests/fullstack/resources/config.py View File

@@ -81,7 +81,8 @@ class NeutronConfigFixture(ConfigFixture):
81 81
                 'policy_file': self._generate_policy_json(),
82 82
             },
83 83
             'agent': {
84
-                'report_interval': str(env_desc.agent_down_time / 2.0)
84
+                'report_interval': str(env_desc.agent_down_time / 2.0),
85
+                'log_agent_heartbeats': 'True',
85 86
             },
86 87
         })
87 88
         # Set root_helper/root_helper_daemon only when env var is set

+ 1
- 1
neutron/tests/fullstack/test_dhcp_agent.py View File

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

Loading…
Cancel
Save