openstack
/
neutron-tempest-plugin
Code Issues Proposed changes

Merge "Make one agent untouchable in test_agent_management"

This commit is contained in:
Zuul 2019-10-23 02:16:02 +00:00 committed by Gerrit Code Review
parent ddca1120ea b57453f84c
commit 7ab2f6de2f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron_tempest_plugin/api/admin/test_agent_management.py
View File

@ -66,10 +66,7 @@ class AgentManagementTestJSON(base.BaseAdminNetworkTest):
@decorators.idempotent_id('68a94a14-1243-46e6-83bf-157627e31556')
def test_update_agent_description(self):
agents = self.admin_client.list_agents()['agents']
try:
dyn_agent = agents[1]
except IndexError:
raise self.skipException("This test requires at least two agents.")
dyn_agent = self._select_one_agent_for_update(agents)
self.useFixture(tempest_fixtures.LockFixture('agent_description'))
description = 'description for update agent.'
@ -86,3 +83,10 @@ class AgentManagementTestJSON(base.BaseAdminNetworkTest):
origin_agent = {'description': description}
self.admin_client.update_agent(agent_id=dyn_agent['id'],
agent_info=origin_agent)
def _select_one_agent_for_update(self, agents):
"""Return one agent that is not the one selected at resource_setup"""
for agent in agents:
if self.agent['id'] != agent['id']:
return agent
raise self.skipException("This test requires at least two agents.")