diff options
author | louiz’ <louiz@louiz.org> | 2019-11-13 23:17:01 +0100 |
---|---|---|
committer | louiz’ <louiz@louiz.org> | 2019-11-13 23:23:13 +0100 |
commit | 440e04c6ba1dfae2d6fbb55b120763e3d0da6cd1 (patch) | |
tree | e139065611dd9b98612d3ab94b8e6953ec377a05 /tests/end_to_end/__main__.py | |
parent | 0cb62d993b43dd048b93e130d96c7757cf10b6d2 (diff) | |
download | biboumi-440e04c6ba1dfae2d6fbb55b120763e3d0da6cd1.tar.gz biboumi-440e04c6ba1dfae2d6fbb55b120763e3d0da6cd1.tar.bz2 biboumi-440e04c6ba1dfae2d6fbb55b120763e3d0da6cd1.tar.xz biboumi-440e04c6ba1dfae2d6fbb55b120763e3d0da6cd1.zip |
e2e: Add a 10s timeout for expect_stanza
Otherwise, if we expect a stanza and biboumi never sends it, we just hang
here.
Now, we display a nice error after 10 seconds, and move on to the next test,
as other failures (xpath doesn’t match) do
Diffstat (limited to 'tests/end_to_end/__main__.py')
-rw-r--r-- | tests/end_to_end/__main__.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py index e85a4f2..cef554e 100644 --- a/tests/end_to_end/__main__.py +++ b/tests/end_to_end/__main__.py @@ -83,6 +83,7 @@ class XMPPComponent(slixmpp.BaseXMPP): self.scenario = scenario self.biboumi = biboumi + self.timeout_handler = None # A callable, taking a stanza as argument and raising a StanzaError # exception if the test should fail. self.stanza_checker = None @@ -96,6 +97,13 @@ class XMPPComponent(slixmpp.BaseXMPP): self.scenario.steps = [] self.failed = True + def on_timeout(self, xpaths): + error_msg = "Timeout while waiting for a stanza that would match the expected xpath(s):" + for xpath in xpaths: + error_msg += "\n" + xpath + self.error(error_msg) + self.run_scenario() + def on_end_session(self, _): self.loop.stop() @@ -113,6 +121,9 @@ class XMPPComponent(slixmpp.BaseXMPP): self.run_scenario() def run_scenario(self): + if self.timeout_handler is not None: + self.timeout_handler.cancel() + self.timeout_handler = None if self.scenario.steps: step = self.scenario.steps.pop(0) try: |