Updated tests and added core live value handling
Removed useless tests, will need to complete a more comprehensive test suite however this is not the priority right now Added a live value dict in the core whose values are populated by the core's input thread
This commit is contained in:
+19
-4
@@ -12,7 +12,7 @@ from rich.logging import RichHandler
|
||||
from dynalab_core.protocols.common import VersionDescriptor
|
||||
from dynalab_core.protocols.constants import PROTOCOL_VERSION
|
||||
from dynalab_core.protocols.json.wire import read_message, write_message
|
||||
from dynalab_core.protocols.packets.data import ValueDescriptor
|
||||
from dynalab_core.protocols.packets.data import ValueBatch, ValueDescriptor
|
||||
from dynalab_core.protocols.packets.handshake import (
|
||||
ConnectorHello,
|
||||
DynaLabHello,
|
||||
@@ -26,9 +26,9 @@ PORT = 8765
|
||||
|
||||
# Set to None to send as quickly as possible.
|
||||
# For a controlled rate, use something like 5_000.0.
|
||||
TARGET_FREQUENCY_HZ: float | None = None
|
||||
TARGET_FREQUENCY_HZ: float | None = 1000
|
||||
|
||||
FREQUENCY_SAMPLE_SIZE = 500
|
||||
FREQUENCY_SAMPLE_SIZE = 20000
|
||||
|
||||
CONNECTOR_VERSION = VersionDescriptor(
|
||||
type="alpha",
|
||||
@@ -116,11 +116,26 @@ def value_sender_thread(
|
||||
|
||||
next_send_time += period
|
||||
|
||||
message = ValueDescriptor(
|
||||
value = ValueDescriptor(
|
||||
signal_id=signal_id,
|
||||
value=2.0,
|
||||
)
|
||||
|
||||
message = ValueBatch(
|
||||
values=[
|
||||
value,
|
||||
value,
|
||||
value,
|
||||
value,
|
||||
value,
|
||||
value,
|
||||
value,
|
||||
value,
|
||||
value,
|
||||
value,
|
||||
]
|
||||
)
|
||||
|
||||
future = asyncio.run_coroutine_threadsafe(
|
||||
send_message(
|
||||
writer,
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
import logging
|
||||
from queue import Queue
|
||||
from uuid import uuid4
|
||||
|
||||
import pytest
|
||||
|
||||
from dynalab_core.protocols.constants import PROTOCOL_VERSION
|
||||
from dynalab_core.protocols.endpoint import ConnectorEndpoint
|
||||
from dynalab_core.protocols.errors import ConnectorEndpointQueueFullError
|
||||
from dynalab_core.protocols.packets import ProtocolMessage
|
||||
from dynalab_core.protocols.packets.handshake import ConnectorHello
|
||||
|
||||
|
||||
def test_full_endpoint_queue_is_logged(caplog: pytest.LogCaptureFixture) -> None:
|
||||
hello = ConnectorHello(
|
||||
connector_uuid=uuid4(),
|
||||
protocol_version=PROTOCOL_VERSION,
|
||||
connector_name="Test connector",
|
||||
connector_version="0.1.0-test",
|
||||
)
|
||||
endpoint = ConnectorEndpoint(hello)
|
||||
endpoint._packet_ingress_queue = Queue[ProtocolMessage](maxsize=1)
|
||||
|
||||
with caplog.at_level(logging.DEBUG, logger="dynalab_core"):
|
||||
try:
|
||||
endpoint.put_ingress_packet(hello)
|
||||
with pytest.raises(ConnectorEndpointQueueFullError):
|
||||
endpoint.put_ingress_packet(hello)
|
||||
finally:
|
||||
endpoint.stop()
|
||||
|
||||
queue_record = next(
|
||||
record
|
||||
for record in caplog.records
|
||||
if getattr(record, "event", None) == "endpoint.queue_full"
|
||||
)
|
||||
assert queue_record.levelno == logging.WARNING
|
||||
assert queue_record.connector_uuid == str(hello.connector_uuid)
|
||||
assert queue_record.queue_direction == "ingress"
|
||||
assert queue_record.queue_size == 1
|
||||
assert queue_record.queue_capacity == 1
|
||||
@@ -11,7 +11,7 @@ from dynalab_core.protocols.json.errors import (
|
||||
JsonServerStartupError,
|
||||
JsonServerTimeoutError,
|
||||
)
|
||||
from dynalab_core.protocols.packets.handshake import ConnectorHello
|
||||
from dynalab_core.protocols.packets.handshake import ConnectorHello, SignalDescriptor
|
||||
from test.common import find_available_port
|
||||
|
||||
|
||||
@@ -93,9 +93,7 @@ def test_json_server_logs_invalid_handshake(
|
||||
assert server_hello
|
||||
peer.sendall(b"not-json\n")
|
||||
|
||||
rejection = _wait_for_event(
|
||||
caplog, "connector.handshake_rejected"
|
||||
)
|
||||
rejection = _wait_for_event(caplog, "connector.handshake_rejected")
|
||||
finally:
|
||||
core.stop()
|
||||
|
||||
@@ -116,6 +114,7 @@ def test_json_server_waits_for_connection_handlers_on_stop(
|
||||
protocol_version=PROTOCOL_VERSION,
|
||||
connector_name="Test connector",
|
||||
connector_version="0.1.0-test",
|
||||
signals=[SignalDescriptor(id=uuid4(), name="Dummy signal", type="number")],
|
||||
)
|
||||
|
||||
with caplog.at_level(logging.DEBUG, logger="dynalab_core"):
|
||||
@@ -124,9 +123,7 @@ def test_json_server_waits_for_connection_handlers_on_stop(
|
||||
with socket.create_connection(("127.0.0.1", port), timeout=1) as peer:
|
||||
peer_file = peer.makefile("rb")
|
||||
assert peer_file.readline()
|
||||
peer.sendall(
|
||||
connector_hello.model_dump_json().encode("utf-8") + b"\n"
|
||||
)
|
||||
peer.sendall(connector_hello.model_dump_json().encode("utf-8") + b"\n")
|
||||
assert b'"type":"handshake_accepted"' in peer_file.readline()
|
||||
|
||||
core.stop()
|
||||
|
||||
Reference in New Issue
Block a user