From ed235610ad159c244440131bdda93fabbad70dda Mon Sep 17 00:00:00 2001 From: ritiek Date: Mon, 15 Jan 2018 14:20:12 +0530 Subject: [PATCH] Move common code to loader.py --- test/loader.py | 14 ++++++++++++++ test/test_simple.py | 17 +++++------------ test/test_spotify.py | 14 +++----------- test/test_username.py | 4 +--- 4 files changed, 23 insertions(+), 26 deletions(-) create mode 100644 test/loader.py diff --git a/test/loader.py b/test/loader.py new file mode 100644 index 0000000..d58c843 --- /dev/null +++ b/test/loader.py @@ -0,0 +1,14 @@ +from core import const +from core import handle +import spotdl + + +def load_defaults(): + const.args = handle.get_arguments(to_group=False, raw_args='') + const.args.folder = 'test' + const.args.overwrite = 'skip' + const.args.log_level = handle.logging.DEBUG + + spotdl.args = const.args + spotdl.log = const.logzero.setup_logger(formatter=const.formatter, + level=const.args.log_level) diff --git a/test/test_simple.py b/test/test_simple.py index 91bc5c1..7ce3067 100644 --- a/test/test_simple.py +++ b/test/test_simple.py @@ -1,23 +1,15 @@ -# -*- coding: UTF-8 -*- - from core import const from core import handle + import spotdl +import loader import os -const.args = handle.get_arguments(to_group=False, raw_args='') -const.args.folder = 'test' -const.args.overwrite = 'skip' -const.args.log_level = handle.logging.DEBUG - -spotdl.args = const.args -spotdl.log = const.logzero.setup_logger(formatter=const.formatter, - level=const.args.log_level) - - +loader.load_defaults() raw_song = "Tony's Videos VERY SHORT VIDEO 28.10.2016" + def test_youtube_url(): expect_url = 'http://youtube.com/watch?v=qOOcy2-tmbk' url = spotdl.youtube_tools.generate_youtube_url(raw_song, meta_tags=None) @@ -32,6 +24,7 @@ def test_youtube_title(): title = spotdl.youtube_tools.get_youtube_title(content) assert title == expect_title + def test_check_exists(): expect_check = False # prerequisites for determining filename diff --git a/test/test_spotify.py b/test/test_spotify.py index d23f9cf..161ac8c 100644 --- a/test/test_spotify.py +++ b/test/test_spotify.py @@ -1,21 +1,13 @@ -# -*- coding: UTF-8 -*- from core import const from core import handle + import spotdl +import loader import os -const.args = handle.get_arguments(to_group=False, raw_args='') -const.args.folder = 'test' -const.args.overwrite = 'skip' -const.args.log_level = handle.logging.DEBUG - -spotdl.args = const.args -spotdl.log = const.logzero.setup_logger(formatter=const.formatter, - level=const.args.log_level) - - +loader.load_defaults() raw_song = 'http://open.spotify.com/track/0JlS7BXXD07hRmevDnbPDU' def test_spotify_title(): diff --git a/test/test_username.py b/test/test_username.py index 4065f76..45552a7 100644 --- a/test/test_username.py +++ b/test/test_username.py @@ -1,10 +1,8 @@ -# -*- coding: UTF-8 -*- - import spotdl +spotify = spotdl.spotify_tools.spotify username = 'alex' -spotify = spotdl.spotify_tools.spotify def test_user(): expect_playlists = 7