openstack/neutron
Code Issues Proposed changes

Merge "tests: Don't raise TimeoutError when waiting for ping"

Browse Source
This commit is contained in:
Jenkins 2016-09-21 11:45:55 +00:00 committed by Gerrit Code Review
commit 409ca39f01
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/tests/common/machine_fixtures.py
View File

@ -22,6 +22,10 @@ from neutron.common import utils
from neutron.tests.common import net_helpers from neutron.tests.common import net_helpers
class FakeMachineException(Exception):
pass
class FakeMachineBase(fixtures.Fixture): class FakeMachineBase(fixtures.Fixture):
"""Create a fake machine. """Create a fake machine.
@ -60,7 +64,11 @@ class FakeMachineBase(fixtures.Fixture):
def block_until_ping(self, dst_ip): def block_until_ping(self, dst_ip):
predicate = functools.partial(self.ping_predicate, dst_ip) predicate = functools.partial(self.ping_predicate, dst_ip)
utils.wait_until_true(predicate) utils.wait_until_true(
predicate,
exception=FakeMachineException(
"No ICMP reply obtained from IP address %s" % dst_ip)
)
def assert_ping(self, dst_ip): def assert_ping(self, dst_ip):
net_helpers.assert_ping(self.namespace, dst_ip) net_helpers.assert_ping(self.namespace, dst_ip)