Skip to content

Commit 4e060a2

Browse files
jmbannonjmbannon
committed
Merge branch 'master' into j/fix-class-check
2 parents 0fe6371 + b195f37 commit 4e060a2

13 files changed

Lines changed: 25 additions & 23 deletions

‎tests/e2e/cli/test_view.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import pytest
44
from conftest import mock_run_from_cli
5-
from resources import DISABLE_YOUTUBE_TESTS
5+
from resources import DISABLE_E2E_TESTS
66

77
from ytdl_sub.utils.file_handler import FileMetadata
88

99

10-
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
10+
@pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
1111
class TestView:
1212
@pytest.mark.parametrize("split_chapters", [True, False])
1313
def test_view_from_cli(

‎tests/e2e/plugins/test_audio_extract.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pytest
22
from expected_download import assert_expected_downloads
33
from expected_transaction_log import assert_transaction_log_matches
4-
from resources import DISABLE_YOUTUBE_TESTS
4+
from resources import DISABLE_E2E_TESTS
55

66
from ytdl_sub.subscriptions.subscription import Subscription
77

@@ -47,7 +47,7 @@ def youtube_release_preset_dict(output_directory):
4747
}
4848

4949

50-
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
50+
@pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
5151
class TestAudioExtract:
5252
@pytest.mark.parametrize("dry_run", [False])
5353
def test_audio_extract_single_song(

‎tests/e2e/plugins/test_chapters.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import pytest
44
from expected_download import assert_expected_downloads
55
from expected_transaction_log import assert_transaction_log_matches
6-
from resources import DISABLE_YOUTUBE_TESTS
6+
from resources import DISABLE_E2E_TESTS
77

88
from ytdl_sub.subscriptions.subscription import Subscription
99

@@ -54,7 +54,7 @@ def chapters_from_comments_preset_dict(sponsorblock_and_subs_preset_dict: Dict)
5454
return sponsorblock_and_subs_preset_dict
5555

5656

57-
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
57+
@pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
5858
class TestChapters:
5959
@pytest.mark.parametrize("dry_run", [True, False])
6060
def test_chapters_sponsorblock_and_removal_with_subs(

‎tests/e2e/plugins/test_date_range.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from conftest import assert_logs
66
from expected_download import assert_expected_downloads
77
from expected_transaction_log import assert_transaction_log_matches
8-
from resources import DISABLE_YOUTUBE_TESTS
8+
from resources import DISABLE_E2E_TESTS
99

1010
from ytdl_sub.downloaders.ytdlp import YTDLP
1111
from ytdl_sub.subscriptions.subscription import Subscription
@@ -39,7 +39,7 @@ def rolling_recent_channel_preset_dict(recent_preset_dict):
3939
)
4040

4141

42-
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
42+
@pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
4343
class TestDateRange:
4444
@pytest.mark.parametrize("dry_run", [True, False])
4545
@pytest.mark.parametrize("date_range_breaks", [True, False])

‎tests/e2e/plugins/test_file_convert.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pytest
22
from expected_download import assert_expected_downloads
33
from expected_transaction_log import assert_transaction_log_matches
4-
from resources import DISABLE_YOUTUBE_TESTS
4+
from resources import DISABLE_E2E_TESTS
55

66
from ytdl_sub.subscriptions.subscription import Subscription
77

@@ -20,7 +20,7 @@ def preset_dict(output_directory):
2020
}
2121

2222

23-
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
23+
@pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
2424
class TestFileConvert:
2525
@pytest.mark.parametrize("dry_run", [True, False])
2626
def test_file_convert(

‎tests/e2e/plugins/test_match_filters.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pytest
22
from expected_download import assert_expected_downloads
33
from expected_transaction_log import assert_transaction_log_matches
4-
from resources import DISABLE_YOUTUBE_TESTS
4+
from resources import DISABLE_E2E_TESTS
55

66
from ytdl_sub.subscriptions.subscription import Subscription
77

@@ -46,7 +46,7 @@ def livestream_preset_dict(output_directory):
4646
}
4747

4848

49-
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
49+
@pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
5050
class TestFileConvert:
5151
def test_livestreams_download_filtered(
5252
self,

‎tests/e2e/plugins/test_split_by_chapters.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import pytest
55
from expected_download import assert_expected_downloads
66
from expected_transaction_log import assert_transaction_log_matches
7-
from resources import DISABLE_YOUTUBE_TESTS
7+
from resources import DISABLE_E2E_TESTS
88

99
from ytdl_sub.subscriptions.subscription import Subscription
1010
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
5858
return yt_album_as_chapters_preset_dict
5959

6060

61-
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
61+
@pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
6262
class TestSplitByChapters:
6363
@pytest.mark.parametrize("dry_run", [True, False])
6464
def test_video_with_chapters(

‎tests/e2e/plugins/test_subtitles.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pytest
22
from expected_download import assert_expected_downloads
33
from expected_transaction_log import assert_transaction_log_matches
4-
from resources import DISABLE_YOUTUBE_TESTS
4+
from resources import DISABLE_E2E_TESTS
55

66
from ytdl_sub.config.config_file import ConfigFile
77
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
3232
return single_video_subs_embed_preset_dict
3333

3434

35-
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
35+
@pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
3636
class TestSubtitles:
3737
def test_subtitle_lang_variable_partial_validates(self, default_config):
3838
default_config_dict = default_config.as_dict()

‎tests/e2e/presets/test_bilateral.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import pytest
44
from expected_transaction_log import assert_transaction_log_matches
5-
from resources import DISABLE_YOUTUBE_TESTS
5+
from resources import DISABLE_E2E_TESTS
66

77
from ytdl_sub.config.config_file import ConfigFile
88
from ytdl_sub.subscriptions.subscription import Subscription
@@ -51,7 +51,7 @@ def tv_show_collection_bilateral_dict(output_directory):
5151
}
5252

5353

54-
@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
54+
@pytest.mark.skipif(DISABLE_E2E_TESTS, reason="YouTube tests cannot run in GH")
5555
class TestBilateral:
5656
def test_tv_show_by_date_downloads_bilateral(
5757
self,

‎tests/e2e/presets/test_soundcloud.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from conftest import assert_logs
55
from expected_download import assert_expected_downloads
66
from expected_transaction_log import assert_transaction_log_matches
7+
from resources import DISABLE_E2E_TESTS
78

89
from ytdl_sub.downloaders.ytdlp import YTDLP
910
from ytdl_sub.subscriptions.subscription import Subscription
@@ -23,6 +24,7 @@ def subscription_dict(output_directory):
2324
}
2425

2526

27+
@pytest.mark.skipif(DISABLE_E2E_TESTS, reason="Soundcloud tests cannot run in GH")
2628
class TestSoundcloudDiscography:
2729
"""
2830
Downloads my (bad) SC recordings I made. Ensure the above files exist and have the

0 commit comments

Comments
 (0)