Skip to content

Commit 5bf9716

Browse files
committed
Fix tests
1 parent 6c761a7 commit 5bf9716

File tree

3 files changed

+14
-47
lines changed

3 files changed

+14
-47
lines changed

poetry_scripts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def run_tests():
3535

3636

3737
def run_local_test():
38-
check_exit_code('poetry run pytest -m "not file_component_sources"')
38+
check_exit_code('poetry run pytest -m "not file_component_sources" -vv')
3939

4040

4141
def run_formatter():

tests/test_notifier.py

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -154,45 +154,6 @@ async def test_peer_connected_disconnected(
154154
for event in event_checks:
155155
self.assert_event(event)
156156

157-
@pytest.mark.asyncio
158-
async def test_peer_connected_disconnected_deleted(
159-
self, room_api: FishjamClient, notifier: FishjamNotifier
160-
):
161-
event_checks = [
162-
ServerMessageRoomCreated,
163-
ServerMessagePeerAdded,
164-
ServerMessagePeerConnected,
165-
ServerMessagePeerDisconnected,
166-
ServerMessagePeerDeleted,
167-
ServerMessageRoomDeleted,
168-
]
169-
170-
assert_task = asyncio.create_task(assert_events(notifier, event_checks.copy()))
171-
172-
notifier_task = asyncio.create_task(notifier.connect())
173-
await notifier.wait_ready()
174-
175-
options = RoomOptions(
176-
webhook_url=WEBHOOK_URL,
177-
peerless_purge_timeout=2,
178-
peer_disconnected_timeout=1,
179-
)
180-
room = room_api.create_room(options=options)
181-
182-
_peer, token = room_api.create_peer(room.id)
183-
184-
peer_socket = PeerSocket(fishjam_url=FISHJAM_URL, auto_close=True)
185-
peer_task = asyncio.create_task(peer_socket.connect(token))
186-
187-
await peer_socket.wait_ready()
188-
189-
await assert_task
190-
await cancel(peer_task)
191-
await cancel(notifier_task)
192-
193-
for event in event_checks:
194-
self.assert_event(event)
195-
196157
@pytest.mark.asyncio
197158
async def test_peer_connected_room_deleted(
198159
self, room_api: FishjamClient, notifier: FishjamNotifier

tests/test_room_api.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
MAX_PEERS = 10
3232
CODEC_H264 = "h264"
3333
AUDIO_ONLY = "audio_only"
34+
FULL_FEATURE = "full_feature"
3435

3536

3637
class TestAuthentication:
@@ -64,10 +65,12 @@ def test_no_params(self, room_api):
6465
max_peers=None,
6566
video_codec=None,
6667
webhook_url=None,
67-
peerless_purge_timeout=None,
68-
peer_disconnected_timeout=None,
68+
room_type=RoomConfigRoomType(FULL_FEATURE),
6969
)
7070
config.__setitem__("roomId", room.config.__getitem__("roomId"))
71+
config.__setitem__(
72+
"peerlessPurgeTimeout", room.config.__getitem__("peerlessPurgeTimeout")
73+
)
7174

7275
assert room == Room(
7376
config=config,
@@ -89,11 +92,12 @@ def test_valid_params(self, room_api):
8992
max_peers=MAX_PEERS,
9093
video_codec=RoomConfigVideoCodec(CODEC_H264),
9194
webhook_url=None,
92-
peerless_purge_timeout=None,
93-
peer_disconnected_timeout=None,
9495
room_type=RoomConfigRoomType(AUDIO_ONLY),
9596
)
9697
config.__setitem__("roomId", room.config.__getitem__("roomId"))
98+
config.__setitem__(
99+
"peerlessPurgeTimeout", room.config.__getitem__("peerlessPurgeTimeout")
100+
)
97101

98102
assert room == Room(
99103
config=config,
@@ -148,10 +152,12 @@ def test_valid(self, room_api: FishjamClient):
148152
max_peers=None,
149153
video_codec=None,
150154
webhook_url=None,
151-
peerless_purge_timeout=None,
152-
peer_disconnected_timeout=None,
155+
room_type=RoomConfigRoomType(FULL_FEATURE),
153156
)
154157
config.__setitem__("roomId", room.config.__getitem__("roomId"))
158+
config.__setitem__(
159+
"peerlessPurgeTimeout", room.config.__getitem__("peerlessPurgeTimeout")
160+
)
155161

156162
assert Room(
157163
peers=[],
@@ -258,4 +264,4 @@ def test_invalid(self, room_api: FishjamClient):
258264
room = room_api.create_room()
259265

260266
with pytest.raises(BadRequestError):
261-
room_api.room_api.create_livestream_viewer_token(room.id)
267+
room_api.create_livestream_viewer_token(room.id)

0 commit comments

Comments
 (0)