Skip to content
Merged
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: 1 addition & 3 deletions src/opensomeip/rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,7 @@ def call(
return_payload = bytes(result.return_values) if result.return_values else b""
return Message(
message_id=method_id,
request_id=RequestId(
client_id=self._client_id, session_id=self._next_session()
),
request_id=RequestId(client_id=self._client_id, session_id=self._next_session()),
message_type=MessageType.RESPONSE,
return_code=ReturnCode.E_OK,
payload=return_payload,
Expand Down
4 changes: 1 addition & 3 deletions src/opensomeip/transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,7 @@ def send(self, message: Message, endpoint: Endpoint | None = None) -> None:
if target is None and hasattr(message, "source_endpoint"):
target = message.source_endpoint
if target is None:
raise TransportError(
"No target endpoint specified and no remote endpoint configured"
)
raise TransportError("No target endpoint specified and no remote endpoint configured")
cpp_ep = to_cpp_endpoint(target)
self._cpp.send_message(cpp_msg, cpp_ep)

Expand Down
34 changes: 21 additions & 13 deletions tests/unit/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from opensomeip.sd import SdConfig, ServiceInstance
from opensomeip.server import TransportMode
from opensomeip.transport import Endpoint, TcpTransport, UdpTransport
from opensomeip.types import MessageId, MessageType
from opensomeip.types import MessageId


@pytest.fixture()
Expand Down Expand Up @@ -111,14 +111,18 @@ def test_find_returns_receiver(self, client_config: ClientConfig) -> None:
assert isinstance(receiver, MessageReceiver)

def test_call_raises_without_native(self, client_config: ClientConfig) -> None:
with SomeIpClient(client_config) as client:
with pytest.raises(RpcError, match="C\\+\\+ extension is not available"):
client.call(MessageId(0x1234, 0x0001), payload=b"\x01")
with (
SomeIpClient(client_config) as client,
pytest.raises(RpcError, match="C\\+\\+ extension is not available"),
):
client.call(MessageId(0x1234, 0x0001), payload=b"\x01")

def test_subscribe_events_raises_without_native(self, client_config: ClientConfig) -> None:
with SomeIpClient(client_config) as client:
with pytest.raises(RuntimeError, match="C\\+\\+ extension is not available"):
client.subscribe_events(eventgroup_id=0x0001)
with (
SomeIpClient(client_config) as client,
pytest.raises(RuntimeError, match="C\\+\\+ extension is not available"),
):
client.subscribe_events(eventgroup_id=0x0001)

@pytest.mark.asyncio
async def test_async_context_manager(self, client_config: ClientConfig) -> None:
Expand Down Expand Up @@ -160,9 +164,11 @@ class TestEventSubscription:
def test_subscribe_then_unsubscribe_raises_without_native(
self, client_config: ClientConfig
) -> None:
with SomeIpClient(client_config) as client:
with pytest.raises(RuntimeError, match="C\\+\\+ extension is not available"):
client.subscribe_events(eventgroup_id=0x0001)
with (
SomeIpClient(client_config) as client,
pytest.raises(RuntimeError, match="C\\+\\+ extension is not available"),
):
client.subscribe_events(eventgroup_id=0x0001)

def test_subscription_status(self, client_config: ClientConfig) -> None:
with SomeIpClient(client_config) as client:
Expand Down Expand Up @@ -281,6 +287,8 @@ def test_e2e_none_when_not_configured(self, client_config: ClientConfig) -> None
assert client.e2e is None

def test_call_with_e2e_raises_without_native(self, e2e_client_config: ClientConfig) -> None:
with SomeIpClient(e2e_client_config) as client:
with pytest.raises(RpcError, match="C\\+\\+ extension is not available"):
client.call(MessageId(0x1234, 0x0001), payload=b"\x01")
with (
SomeIpClient(e2e_client_config) as client,
pytest.raises(RpcError, match="C\\+\\+ extension is not available"),
):
client.call(MessageId(0x1234, 0x0001), payload=b"\x01")
1 change: 0 additions & 1 deletion tests/unit/test_rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from __future__ import annotations

import asyncio
from unittest.mock import MagicMock, patch

import pytest
Expand Down