From 1931194a402e2770f6fff45a05162aaa9dfe0066 Mon Sep 17 00:00:00 2001 From: Jason Lawrence Date: Wed, 27 Jan 2021 16:11:36 -0600 Subject: [PATCH 1/3] Fix session param in tests --- tests/conftest.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 9a7cec5c3..b4d39523f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -114,17 +114,17 @@ def sess(): return session -def get_account(sess): - return MyPlexAccount(session=sess) +def get_account(session): + return MyPlexAccount(session=session) @pytest.fixture(scope="session") -def account(): +def account(sess): if SERVER_TOKEN: - return get_account() + return get_account(sess) assert MYPLEX_USERNAME, "Required MYPLEX_USERNAME not specified." assert MYPLEX_PASSWORD, "Required MYPLEX_PASSWORD not specified." - return get_account() + return get_account(sess) @pytest.fixture(scope="session") @@ -163,7 +163,7 @@ def plex(request, sess): assert SERVER_BASEURL, "Required SERVER_BASEURL not specified." if request.param == TEST_AUTHENTICATED: - token = get_account().authenticationToken + token = get_account(sess).authenticationToken else: token = None return PlexServer(SERVER_BASEURL, token, session=sess) From 5077a3ddcae46b09fdf66521c8898524f49552da Mon Sep 17 00:00:00 2001 From: Jason Lawrence Date: Mon, 1 Feb 2021 20:28:31 -0600 Subject: [PATCH 2/3] Remove get_account helper --- tests/conftest.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index b4d39523f..6aa6e58cf 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -114,17 +114,13 @@ def sess(): return session -def get_account(session): - return MyPlexAccount(session=session) - - @pytest.fixture(scope="session") def account(sess): if SERVER_TOKEN: - return get_account(sess) + return MyPlexAccount(session=sess) assert MYPLEX_USERNAME, "Required MYPLEX_USERNAME not specified." assert MYPLEX_PASSWORD, "Required MYPLEX_PASSWORD not specified." - return get_account(sess) + return MyPlexAccount(session=sess) @pytest.fixture(scope="session") @@ -159,11 +155,11 @@ def mocked_account(requests_mock): @pytest.fixture(scope="session") -def plex(request, sess): +def plex(account, request, sess): assert SERVER_BASEURL, "Required SERVER_BASEURL not specified." if request.param == TEST_AUTHENTICATED: - token = get_account(sess).authenticationToken + token = account.authenticationToken else: token = None return PlexServer(SERVER_BASEURL, token, session=sess) From 781e905eac0e265e380c64e10c556b1ccfb4f895 Mon Sep 17 00:00:00 2001 From: Jason Lawrence Date: Mon, 1 Feb 2021 20:47:43 -0600 Subject: [PATCH 3/3] Remove 'account' from fixtures to avoid skipping tests --- tests/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 6aa6e58cf..40073e614 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -155,11 +155,11 @@ def mocked_account(requests_mock): @pytest.fixture(scope="session") -def plex(account, request, sess): +def plex(request, sess): assert SERVER_BASEURL, "Required SERVER_BASEURL not specified." if request.param == TEST_AUTHENTICATED: - token = account.authenticationToken + token = MyPlexAccount(session=sess).authenticationToken else: token = None return PlexServer(SERVER_BASEURL, token, session=sess)