From 654388793e258e63cca26eb6c310fc65a3148a6c Mon Sep 17 00:00:00 2001 From: voluntas Date: Mon, 16 Sep 2024 16:55:04 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E7=94=A8=E3=81=AE?= =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AE=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/client.py | 16 ++++++++++++++-- tests/test_signaling_message.py | 2 ++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/client.py b/tests/client.py index c9b1c27..991216c 100644 --- a/tests/client.py +++ b/tests/client.py @@ -55,7 +55,7 @@ def __init__( self._connection: SoraConnection = self._sora.create_connection( signaling_urls=signaling_urls, - role="sendonly", + role=self.role, channel_id=channel_id, metadata=metadata, audio=audio, @@ -112,6 +112,10 @@ def get_stats(self): raw_stats = self._connection.get_stats() return json.loads(raw_stats) + @property + def role(self) -> str: + return "sendonly" + @property def connect_message(self) -> Optional[dict[str, Any]]: return self._connect_message @@ -186,8 +190,10 @@ def _on_signaling_message( case "candidate": self._candidate_messages.append(message) case "re-offer": + assert signaling_direction == SoraSignalingDirection.SENT self._re_offer_messages.append(message) case "re-answer": + assert signaling_direction == SoraSignalingDirection.RECEIVED self._re_answer_messages.append(message) case _: NotImplementedError(f"Unknown signaling message type: {message['type']}") @@ -246,7 +252,7 @@ def __init__( self._sora: Sora = Sora(openh264=openh264_path, use_hardware_encoder=use_hwa) self._connection: SoraConnection = self._sora.create_connection( signaling_urls=signaling_urls, - role="recvonly", + role=self.role, channel_id=channel_id, metadata=metadata, data_channel_signaling=data_channel_signaling, @@ -294,6 +300,10 @@ def get_stats(self): raw_stats = self._connection.get_stats() return json.loads(raw_stats) + @property + def role(self) -> str: + return "recvonly" + @property def connect_message(self) -> Optional[dict[str, Any]]: return self._connect_message @@ -362,8 +372,10 @@ def _on_signaling_message( case "candidate": self._candidate_messages.append(message) case "re-offer": + assert signaling_direction == SoraSignalingDirection.RECEIVED self._re_offer_messages.append(message) case "re-answer": + assert signaling_direction == SoraSignalingDirection.SENT self._re_answer_messages.append(message) case _: NotImplementedError(f"Unknown signaling message type: {message['type']}") diff --git a/tests/test_signaling_message.py b/tests/test_signaling_message.py index 75f790a..cbe629a 100644 --- a/tests/test_signaling_message.py +++ b/tests/test_signaling_message.py @@ -31,6 +31,8 @@ def test_random_signaling_message(setup): assert sendonly.offer_message is not None assert sendonly.answer_message is not None + assert sendonly.connect_message["role"] == "sendonly" + assert sendonly.connect_message["channel_id"] is channel_id assert sendonly.connect_message["audio"] is selected_audio assert sendonly.connect_message["video"] is selected_video assert sendonly.connect_message["metadata"] == metadata