Merge "Reduce test_ping_subnet_gateways duration when it fails"

This commit is contained in:
Zuul 2020-10-19 14:09:05 +00:00 committed by Gerrit Code Review
commit 04bab386bc
3 changed files with 3 additions and 4 deletions

View File

@ -89,8 +89,8 @@ def get_ping_usage(ssh_client):
if usage: if usage:
LOG.debug('Got ping usage text') LOG.debug('Got ping usage text')
else: else:
LOG.warning("Unable to get usage message from ping command:\n" raise ValueError("Unable to get usage message from ping command:\n"
"%s", result.details) "%s" % result.details)
return usage return usage

View File

@ -61,7 +61,7 @@ OPTIONS = [
help=("Minimal seconds to wait between every " help=("Minimal seconds to wait between every "
"failed SSH connection attempt")), "failed SSH connection attempt")),
cfg.IntOpt('connection_timeout', cfg.IntOpt('connection_timeout',
default=600., default=200.,
help=("Time before stopping retrying establishing an SSH " help=("Time before stopping retrying establishing an SSH "
"connection")), "connection")),
cfg.StrOpt('proxy_jump', cfg.StrOpt('proxy_jump',

View File

@ -46,7 +46,6 @@ class PortTest(testtools.TestCase):
network_subnets = self.stack.network_stack.network_details['subnets'] network_subnets = self.stack.network_stack.network_details['subnets']
self.assertEqual(set(network_subnets), set(port_subnets)) self.assertEqual(set(network_subnets), set(port_subnets))
@tobiko.retry_test_case(interval=30.)
def test_ping_subnet_gateways(self): def test_ping_subnet_gateways(self):
network_id = self.stack.network_stack.network_id network_id = self.stack.network_stack.network_id
subnets = neutron.list_subnets(network_id=network_id) subnets = neutron.list_subnets(network_id=network_id)