From f367f04d8ddf08ded94c4f0ac418106f46a1d96e Mon Sep 17 00:00:00 2001 From: Hellowlol Date: Thu, 31 Dec 2020 00:28:13 +0100 Subject: [PATCH 1/2] Lets try to increate the timeout. --- tests/conftest.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index d92c3f64a..6b2b6e105 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -105,8 +105,15 @@ def pytest_runtest_setup(item): # --------------------------------- -def get_account(): - return MyPlexAccount() +@pytest.fixture(scope="session") +def sess(): + session = request.Session() + session.request = partial(session.request, timeout=120) + return session + + +def get_account(sess): + return MyPlexAccount(session=sess) @pytest.fixture(scope="session") @@ -150,14 +157,14 @@ def mocked_account(requests_mock): @pytest.fixture(scope="session") -def plex(request): +def plex(request, sess): assert SERVER_BASEURL, "Required SERVER_BASEURL not specified." - session = requests.Session() + if request.param == TEST_AUTHENTICATED: token = get_account().authenticationToken else: token = None - return PlexServer(SERVER_BASEURL, token, session=session) + return PlexServer(SERVER_BASEURL, token, session=sess) @pytest.fixture(scope="session") @@ -166,7 +173,7 @@ def sync_device(account_synctarget): device = account_synctarget.device(clientId=SYNC_DEVICE_IDENTIFIER) except NotFound: device = createMyPlexDevice(SYNC_DEVICE_HEADERS, account_synctarget) - + assert device assert "sync-target" in device.provides return device From 2fa4d3165454238f88327a41b684382125cbdb41 Mon Sep 17 00:00:00 2001 From: Steffen Fredriksen Date: Thu, 31 Dec 2020 00:38:48 +0100 Subject: [PATCH 2/2] fix typo --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 6b2b6e105..ebea1c1ad 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -107,7 +107,7 @@ def pytest_runtest_setup(item): @pytest.fixture(scope="session") def sess(): - session = request.Session() + session = requests.Session() session.request = partial(session.request, timeout=120) return session