Skip to content

Commit 116efa8

Browse files
Fix tests
1 parent d842a59 commit 116efa8

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

pyleco/json_utils/errors.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@
7171
class JSONRPCError(Exception):
7272
"""Base error that all JSON RPC exceptions extend."""
7373

74+
rpc_error: JsonRpcError
75+
7476
def __init__(self, error: JsonRpcError) -> None:
7577
msg = f"{error.code}: {error.message}"
7678
self.rpc_error = error

pyleco/utils/extended_data_publisher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def handle_json_error(self, message: Message) -> None:
9191
except JSONRPCError as exc:
9292
error_code = exc.rpc_error.code
9393
try:
94-
error_data = exc.rpc_error.data
94+
error_data = exc.rpc_error.data # type: ignore
9595
except AttributeError:
9696
return
9797
if error_code == RECEIVER_UNKNOWN:

tests/acceptance_tests/test_director_actor.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
import pytest
3131

32-
from pyleco.core.message import MessageTypes
3332
from pyleco.coordinators.coordinator import Coordinator
3433
from pyleco.actors.actor import Actor
3534
from pyleco.directors.director import Director
@@ -178,15 +177,9 @@ def test_data_via_control_protocol(director: Director):
178177
director.ask_rpc("publish")
179178

180179
msg = director.communicator.read_message(conversation_id=None)
181-
director.communicator.send(
182-
receiver=director.actor, # type: ignore
183-
data={"jsonrpc": "2.0", "id": 1, "result": None},
184-
conversation_id=msg.conversation_id,
185-
message_type=MessageTypes.JSON,
186-
)
187180

188181
# teardown
189182
director.ask_rpc("unregister_subscriber")
190183

191-
assert msg.data == {"jsonrpc": "2.0", "id": 1, "method": "add_subscription_message"}
184+
assert msg.data == {"jsonrpc": "2.0", "method": "add_subscription_message"}
192185
assert msg.payload[1:] == [b'super content']

tests/utils/test_extended_data_publisher.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ def test_unregister_subscribers(publisher: ExtendedDataPublisher):
8686

8787
@pytest.mark.parametrize("receivers", (set(), {b"abc"}, {b"abc", b"def"}, {"string"}))
8888
def test_convert(publisher: ExtendedDataPublisher, receivers, data_message: DataMessage):
89-
msgs = publisher.convert_data_message_to_messages(data_message, receivers=receivers)
90-
for rec, msg in zip(receivers, msgs, strict=True):
89+
msgs = list(publisher.convert_data_message_to_messages(data_message, receivers=receivers))
90+
assert len(msgs) == len(receivers)
91+
for rec, msg in zip(receivers, msgs):
9192
assert msg == Message(
9293
receiver=rec,
9394
data=Notification(method="add_subscription_message"),

0 commit comments

Comments
 (0)