From a75e94e43e549f29a6a8ec5ca2b7743f13947208 Mon Sep 17 00:00:00 2001 From: Serene-Arc Date: Mon, 15 Feb 2021 19:16:51 +1000 Subject: [PATCH] Restructure test fixtures --- bulkredditdownloader/tests/conftest.py | 11 +++++++++++ .../tests/downloaders/test_gallery.py | 6 ++---- .../tests/test_file_name_formatter.py | 5 ++--- 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 bulkredditdownloader/tests/conftest.py diff --git a/bulkredditdownloader/tests/conftest.py b/bulkredditdownloader/tests/conftest.py new file mode 100644 index 0000000..e1de72e --- /dev/null +++ b/bulkredditdownloader/tests/conftest.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python3 +# coding=utf-8 + +import praw +import pytest + + +@pytest.fixture(scope='session') +def reddit_instance(): + rd = praw.Reddit(client_id='U-6gk4ZCh3IeNQ', client_secret='7CZHY6AmKweZME5s50SfDGylaPg', user_agent='test') + return rd diff --git a/bulkredditdownloader/tests/downloaders/test_gallery.py b/bulkredditdownloader/tests/downloaders/test_gallery.py index f590c60..1fd41e9 100644 --- a/bulkredditdownloader/tests/downloaders/test_gallery.py +++ b/bulkredditdownloader/tests/downloaders/test_gallery.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 # coding=utf-8 -import praw import praw.models import pytest @@ -10,9 +9,8 @@ from bulkredditdownloader.site_downloaders.gallery import Gallery @pytest.fixture() -def reddit_submission() -> praw.models.Submission: - rd = praw.Reddit(client_id='U-6gk4ZCh3IeNQ', client_secret='7CZHY6AmKweZME5s50SfDGylaPg', user_agent='test') - return rd.submission(id='ljyy27') +def reddit_submission(reddit_instance) -> praw.models.Submission: + return reddit_instance.submission(id='ljyy27') def test_gallery(reddit_submission: praw.models.Submission): diff --git a/bulkredditdownloader/tests/test_file_name_formatter.py b/bulkredditdownloader/tests/test_file_name_formatter.py index 94a6245..d884cb4 100644 --- a/bulkredditdownloader/tests/test_file_name_formatter.py +++ b/bulkredditdownloader/tests/test_file_name_formatter.py @@ -25,9 +25,8 @@ def submission() -> Mock: @pytest.fixture() -def reddit_submission() -> praw.models.Submission: - rd = praw.Reddit(client_id='U-6gk4ZCh3IeNQ', client_secret='7CZHY6AmKweZME5s50SfDGylaPg', user_agent='test') - return rd.submission(id='lgilgt') +def reddit_submission(reddit_instance) -> praw.models.Submission: + return reddit_instance.submission(id='lgilgt') @pytest.mark.parametrize(('format_string', 'expected'), (('{SUBREDDIT}', 'randomreddit'),