Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/hio/core/tcp/serving.py
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ def serviceAxes(self):
cs=cs,
bs=self.bs,
wl=self.wl,
timeout=self.tymeout)
tymeout=self.tymeout)
if ca in self.ixes and self.ixes[ca] is not remoter:
self.shutdownIx(ca)
self.ixes[ca] = remoter
Expand Down Expand Up @@ -556,7 +556,7 @@ def serviceAxes(self):
bs=self.bs,
cs=cs,
wl=self.wl,
timeout=self.tymeout,
tymeout=self.tymeout,
context=self.context,
version=self.version,
certify=self.certify,
Expand Down
43 changes: 42 additions & 1 deletion tests/core/tcp/test_tcp.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def test_tcp_basic():
assert server.opened == False

tymist = tyming.Tymist()
with tcp.openServer(tymth=tymist.tymen(), ha=("", 6101)) as server, \
with tcp.openServer(tymth=tymist.tymen(), ha=("", 6101), tymeout=1.5) as server, \
tcp.openClient(tymth=tymist.tymen(), ha=("127.0.0.1", 6101)) as beta, \
tcp.openClient(tymth=tymist.tymen(), ha=("127.0.0.1", 6101)) as gamma:

Expand Down Expand Up @@ -136,6 +136,8 @@ def test_tcp_basic():
assert ixBeta.cs.getpeername() == beta.cs.getsockname() # ixBeta remote beta local
assert ixBeta.ca == beta.ca == ixBeta.cs.getpeername()
assert ixBeta.ha == beta.ha == ixBeta.cs.getsockname()
assert ixBeta.tymeout == server.tymeout == 1.5
assert ixBeta.tymer.duration == ixBeta.tymeout

msgOut = b"Beta sends to Server"
count = beta.send(msgOut)
Expand Down Expand Up @@ -472,6 +474,42 @@ def test_tcp_basic():

"""Done Test"""


def test_server_idle_tymeout_enables_remoter_cleanup():
"""
Test a supervisor can remove an idle Remoter at the Server's tymeout.
"""
tymist = tyming.Tymist()
with tcp.openServer(tymth=tymist.tymen(),
ha=("127.0.0.1", 0),
tymeout=1.0) as server:
# Acceptor does not refresh .eha after binding an ephemeral port.
server.eha = server.ha

with tcp.openClient(tymth=tymist.tymen(), ha=server.ha) as client:
for _ in range(10):
client.serviceConnect()
server.serviceConnects()
if client.connected and client.ca in server.ixes:
break
time.sleep(0.05)

assert client.connected == True
assert client.ca in server.ixes

remoter = server.ixes[client.ca]
assert server.tymeout == 1.0

tymist.tick(tock=server.tymeout)

# HIO HTTP and KERIpy supervisors treat zero tymeout as disabled.
if remoter.tymeout > 0.0 and remoter.tymer.expired:
server.removeIx(client.ca)

assert client.ca not in server.ixes
assert remoter.cs is None


def test_tcp_service():
"""
Test Classes tcp service methods
Expand Down Expand Up @@ -691,6 +729,7 @@ def test_tcp_tls_default_context():
with tcp.openServer(cls=tcp.ServerTls,
tymth=tymist.tymen(),
ha=("", 6101),
tymeout=1.5,
bs=16192,
keypath=serverKeyPath,
certpath=serverCertPath,
Expand Down Expand Up @@ -730,6 +769,8 @@ def test_tcp_tls_default_context():
assert ixBeta.cs.getpeername() == beta.cs.getsockname()
assert ixBeta.ca == beta.ca
assert ixBeta.ha == beta.ha
assert ixBeta.tymeout == server.tymeout == 1.5
assert ixBeta.tymer.duration == ixBeta.tymeout

msgOut = b"Beta sends to Server\n"
beta.tx(msgOut)
Expand Down
1 change: 1 addition & 0 deletions tests/wasm/test_webduring_wasm.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ async def test_webduror_wasm_contract(selenium):
import hio.base
from hio.base import WebDuror

# WASM must not eagerly import native-only persistence backends.
assert "hio.base.during" not in sys.modules
assert "pysodium" not in sys.modules
assert "pychloride" not in sys.modules
Expand Down
Loading