danvics/ytdl-sub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into j/fix-class-check

Browse source
This commit is contained in:
Jesse Bannon 2026-05-10 09:00:01 -07:00
commit 4e060a276d
13 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/e2e/cli/test_view.py
View file

@ -2,12 +2,12 @@ from typing import Optional
import pytest import pytest
from conftest import mock_run_from_cli from conftest import mock_run_from_cli
from resources import DISABLE_YOUTUBE_TESTS from resources import DISABLE_E2E_TESTS
from ytdl_sub.utils.file_handler import FileMetadata from ytdl_sub.utils.file_handler import FileMetadata
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH") @pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
class TestView: class TestView:
@pytest.mark.parametrize("split_chapters", [True, False]) @pytest.mark.parametrize("split_chapters", [True, False])
def test_view_from_cli( def test_view_from_cli(

4
tests/e2e/plugins/test_audio_extract.py
View file

@ -1,7 +1,7 @@
import pytest import pytest
from expected_download import assert_expected_downloads from expected_download import assert_expected_downloads
from expected_transaction_log import assert_transaction_log_matches from expected_transaction_log import assert_transaction_log_matches
from resources import DISABLE_YOUTUBE_TESTS from resources import DISABLE_E2E_TESTS
from ytdl_sub.subscriptions.subscription import Subscription from ytdl_sub.subscriptions.subscription import Subscription
@ -47,7 +47,7 @@ def youtube_release_preset_dict(output_directory):
} }
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH") @pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
class TestAudioExtract: class TestAudioExtract:
@pytest.mark.parametrize("dry_run", [False]) @pytest.mark.parametrize("dry_run", [False])
def test_audio_extract_single_song( def test_audio_extract_single_song(

4
tests/e2e/plugins/test_chapters.py
View file

@ -3,7 +3,7 @@ from typing import Dict
import pytest import pytest
from expected_download import assert_expected_downloads from expected_download import assert_expected_downloads
from expected_transaction_log import assert_transaction_log_matches from expected_transaction_log import assert_transaction_log_matches
from resources import DISABLE_YOUTUBE_TESTS from resources import DISABLE_E2E_TESTS
from ytdl_sub.subscriptions.subscription import Subscription from ytdl_sub.subscriptions.subscription import Subscription
@ -54,7 +54,7 @@ def chapters_from_comments_preset_dict(sponsorblock_and_subs_preset_dict: Dict)
return sponsorblock_and_subs_preset_dict return sponsorblock_and_subs_preset_dict
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH") @pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
class TestChapters: class TestChapters:
@pytest.mark.parametrize("dry_run", [True, False]) @pytest.mark.parametrize("dry_run", [True, False])
def test_chapters_sponsorblock_and_removal_with_subs( def test_chapters_sponsorblock_and_removal_with_subs(

4
tests/e2e/plugins/test_date_range.py
View file

@ -5,7 +5,7 @@ import pytest
from conftest import assert_logs from conftest import assert_logs
from expected_download import assert_expected_downloads from expected_download import assert_expected_downloads
from expected_transaction_log import assert_transaction_log_matches from expected_transaction_log import assert_transaction_log_matches
from resources import DISABLE_YOUTUBE_TESTS from resources import DISABLE_E2E_TESTS
from ytdl_sub.downloaders.ytdlp import YTDLP from ytdl_sub.downloaders.ytdlp import YTDLP
from ytdl_sub.subscriptions.subscription import Subscription from ytdl_sub.subscriptions.subscription import Subscription
@ -39,7 +39,7 @@ def rolling_recent_channel_preset_dict(recent_preset_dict):
) )
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH") @pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
class TestDateRange: class TestDateRange:
@pytest.mark.parametrize("dry_run", [True, False]) @pytest.mark.parametrize("dry_run", [True, False])
@pytest.mark.parametrize("date_range_breaks", [True, False]) @pytest.mark.parametrize("date_range_breaks", [True, False])

4
tests/e2e/plugins/test_file_convert.py
View file

@ -1,7 +1,7 @@
import pytest import pytest
from expected_download import assert_expected_downloads from expected_download import assert_expected_downloads
from expected_transaction_log import assert_transaction_log_matches from expected_transaction_log import assert_transaction_log_matches
from resources import DISABLE_YOUTUBE_TESTS from resources import DISABLE_E2E_TESTS
from ytdl_sub.subscriptions.subscription import Subscription from ytdl_sub.subscriptions.subscription import Subscription
@ -20,7 +20,7 @@ def preset_dict(output_directory):
} }
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH") @pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
class TestFileConvert: class TestFileConvert:
@pytest.mark.parametrize("dry_run", [True, False]) @pytest.mark.parametrize("dry_run", [True, False])
def test_file_convert( def test_file_convert(

4
tests/e2e/plugins/test_match_filters.py
View file

@ -1,7 +1,7 @@
import pytest import pytest
from expected_download import assert_expected_downloads from expected_download import assert_expected_downloads
from expected_transaction_log import assert_transaction_log_matches from expected_transaction_log import assert_transaction_log_matches
from resources import DISABLE_YOUTUBE_TESTS from resources import DISABLE_E2E_TESTS
from ytdl_sub.subscriptions.subscription import Subscription from ytdl_sub.subscriptions.subscription import Subscription
@ -46,7 +46,7 @@ def livestream_preset_dict(output_directory):
} }
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH") @pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
class TestFileConvert: class TestFileConvert:
def test_livestreams_download_filtered( def test_livestreams_download_filtered(
self, self,

4
tests/e2e/plugins/test_split_by_chapters.py
View file

@ -4,7 +4,7 @@ import mergedeep
import pytest import pytest
from expected_download import assert_expected_downloads from expected_download import assert_expected_downloads
from expected_transaction_log import assert_transaction_log_matches from expected_transaction_log import assert_transaction_log_matches
from resources import DISABLE_YOUTUBE_TESTS from resources import DISABLE_E2E_TESTS
from ytdl_sub.subscriptions.subscription import Subscription from ytdl_sub.subscriptions.subscription import Subscription
from ytdl_sub.utils.exceptions import ValidationException from ytdl_sub.utils.exceptions import ValidationException
@ -58,7 +58,7 @@ def yt_album_as_chapters_with_regex_preset_dict(yt_album_as_chapters_preset_dict
return yt_album_as_chapters_preset_dict return yt_album_as_chapters_preset_dict
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH") @pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
class TestSplitByChapters: class TestSplitByChapters:
@pytest.mark.parametrize("dry_run", [True, False]) @pytest.mark.parametrize("dry_run", [True, False])
def test_video_with_chapters( def test_video_with_chapters(

4
tests/e2e/plugins/test_subtitles.py
View file

@ -1,7 +1,7 @@
import pytest import pytest
from expected_download import assert_expected_downloads from expected_download import assert_expected_downloads
from expected_transaction_log import assert_transaction_log_matches from expected_transaction_log import assert_transaction_log_matches
from resources import DISABLE_YOUTUBE_TESTS from resources import DISABLE_E2E_TESTS
from ytdl_sub.config.config_file import ConfigFile from ytdl_sub.config.config_file import ConfigFile
from ytdl_sub.subscriptions.subscription import Subscription from ytdl_sub.subscriptions.subscription import Subscription
@ -32,7 +32,7 @@ def test_single_video_subs_embed_and_file_preset_dict(single_video_subs_embed_pr
return single_video_subs_embed_preset_dict return single_video_subs_embed_preset_dict
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH") @pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
class TestSubtitles: class TestSubtitles:
def test_subtitle_lang_variable_partial_validates(self, default_config): def test_subtitle_lang_variable_partial_validates(self, default_config):
default_config_dict = default_config.as_dict() default_config_dict = default_config.as_dict()

4
tests/e2e/presets/test_bilateral.py
View file

@ -2,7 +2,7 @@ from typing import Dict
import pytest import pytest
from expected_transaction_log import assert_transaction_log_matches from expected_transaction_log import assert_transaction_log_matches
from resources import DISABLE_YOUTUBE_TESTS from resources import DISABLE_E2E_TESTS
from ytdl_sub.config.config_file import ConfigFile from ytdl_sub.config.config_file import ConfigFile
from ytdl_sub.subscriptions.subscription import Subscription from ytdl_sub.subscriptions.subscription import Subscription
@ -51,7 +51,7 @@ def tv_show_collection_bilateral_dict(output_directory):
} }
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH") @pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
class TestBilateral: class TestBilateral:
def test_tv_show_by_date_downloads_bilateral( def test_tv_show_by_date_downloads_bilateral(
self, self,

2
tests/e2e/presets/test_soundcloud.py
View file

@ -4,6 +4,7 @@ import pytest
from conftest import assert_logs from conftest import assert_logs
from expected_download import assert_expected_downloads from expected_download import assert_expected_downloads
from expected_transaction_log import assert_transaction_log_matches from expected_transaction_log import assert_transaction_log_matches
from resources import DISABLE_E2E_TESTS
from ytdl_sub.downloaders.ytdlp import YTDLP from ytdl_sub.downloaders.ytdlp import YTDLP
from ytdl_sub.subscriptions.subscription import Subscription from ytdl_sub.subscriptions.subscription import Subscription
@ -23,6 +24,7 @@ def subscription_dict(output_directory):
} }
@pytest.mark.skipif(DISABLE_E2E_TESTS, reason="Soundcloud tests cannot run in GH")
class TestSoundcloudDiscography: class TestSoundcloudDiscography:
""" """
Downloads my (bad) SC recordings I made. Ensure the above files exist and have the Downloads my (bad) SC recordings I made. Ensure the above files exist and have the

4
tests/e2e/youtube/test_channel.py
View file

@ -3,7 +3,7 @@ from typing import Callable, Dict
import pytest import pytest
from expected_download import assert_expected_downloads from expected_download import assert_expected_downloads
from expected_transaction_log import assert_transaction_log_matches from expected_transaction_log import assert_transaction_log_matches
from resources import DISABLE_YOUTUBE_TESTS from resources import DISABLE_E2E_TESTS
from ytdl_sub.config.config_file import ConfigFile from ytdl_sub.config.config_file import ConfigFile
from ytdl_sub.subscriptions.subscription import Subscription from ytdl_sub.subscriptions.subscription import Subscription
@ -42,7 +42,7 @@ def channel_preset_dict(output_directory):
} }
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH") @pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
class TestChannel: class TestChannel:
""" """
Downloads my old minecraft youtube channel. Ensure the above files exist and have the Downloads my old minecraft youtube channel. Ensure the above files exist and have the

4
tests/e2e/youtube/test_video.py
View file

@ -1,7 +1,7 @@
import pytest import pytest
from expected_download import assert_expected_downloads from expected_download import assert_expected_downloads
from expected_transaction_log import assert_transaction_log_matches from expected_transaction_log import assert_transaction_log_matches
from resources import DISABLE_YOUTUBE_TESTS from resources import DISABLE_E2E_TESTS
from ytdl_sub.subscriptions.subscription import Subscription from ytdl_sub.subscriptions.subscription import Subscription
@ -30,7 +30,7 @@ def single_video_preset_dict(output_directory):
} }
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH") @pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
class TestYoutubeVideo: class TestYoutubeVideo:
@pytest.mark.parametrize("dry_run", [True, False]) @pytest.mark.parametrize("dry_run", [True, False])
def test_single_video_download( def test_single_video_download(

2
tests/resources.py
View file

@ -4,7 +4,7 @@ import shutil
from pathlib import Path from pathlib import Path
from typing import Dict from typing import Dict
DISABLE_YOUTUBE_TESTS: bool = True DISABLE_E2E_TESTS: bool = True
REGENERATE_FIXTURES: bool = False REGENERATE_FIXTURES: bool = False
RESOURCE_PATH: Path = Path("tests") / "resources" RESOURCE_PATH: Path = Path("tests") / "resources"