x/tobiko
Code Issues Proposed changes

Skip tests when neutron agents are missing

Browse Source 
Change-Id: I3e4c4252b3726b51fce1ec0ac3455c7ba892eda0
This commit is contained in:
Federico Ressi 2020-10-14 09:47:33 +02:00
parent 9ea4160968
commit 13a51715c5
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tobiko/tests/faults/agents/test_neutron_agents.py
View File

@ -214,6 +214,7 @@ class BaseAgentTest(testtools.TestCase):
return process_destroyed
@neutron.skip_if_missing_networking_agents(neutron.DHCP_AGENT)
class DHCPAgentTest(BaseAgentTest):
#: Resources stack with Nova server to send messages to
@ -273,6 +274,7 @@ class DHCPAgentTest(BaseAgentTest):
self.get_cmd_pids("dnsmasq", self.stack.network, dhcp_agents_hosts)
@neutron.skip_if_missing_networking_agents(neutron.L3_AGENT)
class L3AgentTest(BaseAgentTest):
#: Resources stack with Nova server to send messages to
@ -436,6 +438,7 @@ class L3AgentTest(BaseAgentTest):
l3_agents_hosts))
@neutron.skip_if_missing_networking_agents(neutron.OPENVSWITCH_AGENT)
class OvsAgentTest(BaseAgentTest):
#: Resources stack with Nova server to send messages to
@ -473,6 +476,7 @@ class OvsAgentTest(BaseAgentTest):
self.start_service_on_hosts(self.agent_service_name, [agent['host']])
@neutron.skip_if_missing_networking_agents(neutron.METADATA_AGENT)
class MetadataAgentTest(BaseAgentTest):
#: Resources stack with Nova server to send messages to

4
tobiko/tests/faults/ha/test_cloud_recovery.py
View File

@ -92,13 +92,13 @@ class DisruptTripleoNodesTest(testtools.TestCase):
# overcloud_health_checks()
# cloud_disruptions.network_undisrupt_controllers_non_main_vip()
@neutron.skip_if_missing_networking_agents(binary='ovn-controller')
@neutron.skip_if_missing_networking_agents(neutron.OVN_CONTROLLER)
def test_reset_ovndb_master_resource(self):
overcloud_health_checks()
cloud_disruptions.reset_ovndb_master_resource()
overcloud_health_checks()
@neutron.skip_if_missing_networking_agents(binary='ovn-controller')
@neutron.skip_if_missing_networking_agents(neutron.OVN_CONTROLLER)
def test_reset_ovndb_master_container(self):
overcloud_health_checks()
cloud_disruptions.reset_ovndb_master_container()

4
tobiko/tests/faults/neutron/test_ovs.py
View File

@ -27,8 +27,8 @@ from tobiko.shell import sh
from tobiko.tripleo import undercloud
@neutron.skip_if_missing_networking_agents(binary='neutron-openvswitch-agent')
@neutron.skip_if_missing_networking_agents(binary='neutron-l3-agent')
@neutron.skip_if_missing_networking_agents(neutron.OPENVSWITCH_AGENT)
@neutron.skip_if_missing_networking_agents(neutron.L3_AGENT)
class OpenvswitchTest(testtools.TestCase):
stack = tobiko.required_setup_fixture(stacks.CirrosServerStackFixture)

3
tobiko/tests/functional/openstack/stacks/test_neutron.py
View File

@ -94,8 +94,7 @@ class NetworkWithNetMtuWriteTest(NetworkTest):
@keystone.skip_unless_has_keystone_credentials()
@neutron.skip_if_missing_networking_extensions('l3-ha')
@neutron.skip_if_missing_networking_agents(binary='neutron-l3-agent',
count=2)
@neutron.skip_if_missing_networking_agents(neutron.L3_AGENT, 2)
class L3HaNetworkTest(NetworkTest):
#: Stack of resources with a network with a gateway router