Skip to content

Commit 149c05d

Browse files
committed
Use pytest-timeout plugin to limit client/server test which is hanging on linux and flaky to allow it to re-run.
1 parent c4916ec commit 149c05d

3 files changed

Lines changed: 9 additions & 0 deletions

File tree

requirements_testing.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ flaky
55
nose
66
pytest>=4.6 # Required by pytest-cov, but not resolved by pip on linux
77
pytest-cov
8+
pytest-timeout

yggdrasil/drivers/tests/test_ClientDriver.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import flaky
2+
import pytest
13
from yggdrasil.tests import assert_raises, assert_equal
24
import yggdrasil.drivers.tests.test_ConnectionDriver as parent
35
from yggdrasil import runner, tools
@@ -131,6 +133,8 @@ def test_send_recv(self, msg_send=None):
131133
assert(flag)
132134
assert_equal(cli_msg, msg_send)
133135

136+
@flaky.flaky(max_runs=3)
137+
@pytest.mark.timeout(60)
134138
def test_send_recv_nolimit(self):
135139
r"""Test routing of a large message between client and server."""
136140
self.test_send_recv(msg_send=self.msg_long)

yggdrasil/drivers/tests/test_ServerDriver.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import flaky
2+
import pytest
13
import uuid
24
from yggdrasil.tests import assert_raises, assert_equal
35
import yggdrasil.drivers.tests.test_ConnectionDriver as parent
@@ -165,6 +167,8 @@ def test_send_recv(self, msg_send=None):
165167
assert(flag)
166168
assert_equal(cli_msg, msg_send)
167169

170+
@flaky.flaky(max_runs=3)
171+
@pytest.mark.timeout(60)
168172
def test_send_recv_nolimit(self):
169173
r"""Test routing of a large message between client and server."""
170174
self.test_send_recv(msg_send=self.msg_long)

0 commit comments

Comments
 (0)