From 4663f260b55de0975661fda1c00f60d2ca6e4506 Mon Sep 17 00:00:00 2001 From: salmonik Date: Wed, 20 May 2026 15:40:18 +0200 Subject: Clean up consumers: replace polling with VoiceManager.play_source() - cron.py: replace while-is_playing polling with VoiceManager.play_source() - vclogs.py: replace while-is_playing polling with VoiceManager.play_source() - stop.py: use VoiceManager.disconnect() instead of raw voice_client - join.py: use VoiceManager.connect() instead of raw channel.connect() - voice.py: add back join_by_channel_id() convenience method - Tests: update for new VoiceManager method names and signatures --- tests/cogs/test_music_join.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'tests/cogs/test_music_join.py') diff --git a/tests/cogs/test_music_join.py b/tests/cogs/test_music_join.py index 0176759..b40d93a 100644 --- a/tests/cogs/test_music_join.py +++ b/tests/cogs/test_music_join.py @@ -24,16 +24,18 @@ async def test_join_command_success(join_cog, mock_channel, mock_guild, bot, moc ctx.author = mock_user mock_voice_channel = MagicMock() - mock_voice = MagicMock() - mock_voice_channel.connect = AsyncMock(return_value=mock_voice) - ctx.author.voice = MagicMock() ctx.author.voice.channel = mock_voice_channel - with patch.object(mock_voice_channel, 'connect', new_callable=AsyncMock, return_value=mock_voice): + with patch('cogs.music.join.get_voice_manager') as mock_get_vm: + mock_vm = MagicMock() + mock_vm.connect = AsyncMock() + mock_get_vm.return_value = mock_vm + with patch.object(ctx, 'respond', new_callable=AsyncMock): with patch.object(ctx.interaction, 'delete_original_response', new_callable=AsyncMock): await join_cog.join.callback(join_cog, ctx) + mock_vm.connect.assert_called_once_with(mock_voice_channel) @pytest.mark.asyncio @@ -42,12 +44,13 @@ async def test_stop_command_success(stop_cog, mock_channel, mock_guild, bot, moc ctx.user = mock_user ctx.author = mock_user - mock_voice_client = MagicMock() - mock_voice_client.disconnect = AsyncMock() - ctx.voice_client = mock_voice_client + with patch('cogs.music.stop.get_voice_manager') as mock_get_vm: + mock_vm = MagicMock() + mock_vm.disconnect = AsyncMock() + mock_get_vm.return_value = mock_vm - with patch.object(ctx, 'respond', new_callable=AsyncMock): - with patch.object(ctx.interaction, 'delete_original_response', new_callable=AsyncMock): - await stop_cog.stop.callback(stop_cog, ctx) + with patch.object(ctx, 'respond', new_callable=AsyncMock): + with patch.object(ctx.interaction, 'delete_original_response', new_callable=AsyncMock): + await stop_cog.stop.callback(stop_cog, ctx) - mock_voice_client.disconnect.assert_called_once() + mock_vm.disconnect.assert_called_once_with(mock_guild) -- cgit v1.2.3