From 99f8780463c75090dcc1f0037abfc086c8bba70b Mon Sep 17 00:00:00 2001 From: Max Berger Date: Thu, 26 Mar 2026 21:35:12 +0100 Subject: [PATCH] Fixed imports --- integ_tests/common.py | 11 +++-------- integ_tests/test_basic_operation.py | 19 +++++++++---------- integ_tests/test_delete.py | 20 +++++++++----------- integ_tests/test_download.py | 12 ++++-------- integ_tests/test_edit.py | 12 +++--------- integ_tests/test_scenes.py | 12 +++--------- integ_tests/test_scenes_login.py | 9 ++------- integ_tests/test_sharing.py | 11 +++-------- integ_tests/test_sharing_login.py | 8 ++------ integ_tests/test_upload.py | 11 +++-------- 10 files changed, 41 insertions(+), 84 deletions(-) diff --git a/integ_tests/common.py b/integ_tests/common.py index 4f758238..9813349d 100644 --- a/integ_tests/common.py +++ b/integ_tests/common.py @@ -25,12 +25,10 @@ import subprocess import sys import time from dataclasses import dataclass +from enum import Enum from typing import Any, Generator, Optional -from playwright.sync_api import BrowserContext, Page - - -from enum import Enum +from playwright.sync_api import BrowserContext, Page, expect class AuthType(Enum): @@ -101,7 +99,7 @@ type = {config.auth_type.value} f.write("htpasswd_encryption = plain\n") f.write( - f"""[web] + """[web] type = internal [headers] Content-Security-Policy = default-src 'self'; object-src 'none' @@ -172,9 +170,6 @@ max:maxpassword process.wait() -from playwright.sync_api import BrowserContext, Page, expect - - def login( page: Page, radicale_server: str, diff --git a/integ_tests/test_basic_operation.py b/integ_tests/test_basic_operation.py index d7f55d58..e802a325 100644 --- a/integ_tests/test_basic_operation.py +++ b/integ_tests/test_basic_operation.py @@ -24,14 +24,9 @@ from typing import Any, Generator import pytest from playwright.sync_api import BrowserContext, Page, expect -from integ_tests.common import ( - NOSHARE_HTPASSWD, - SHARING_HTPASSWD, - SHARING_XREMOTE, - Config, - login, - start_radicale_server, -) +from integ_tests.common import (NOSHARE_HTPASSWD, SHARING_HTPASSWD, + SHARING_XREMOTE, Config, login, + start_radicale_server) @pytest.fixture @@ -41,7 +36,9 @@ def radicale_server( yield from start_radicale_server(tmp_path, config) -@pytest.mark.parametrize("config", [SHARING_HTPASSWD, SHARING_XREMOTE, NOSHARE_HTPASSWD]) +@pytest.mark.parametrize( + "config", [SHARING_HTPASSWD, SHARING_XREMOTE, NOSHARE_HTPASSWD] +) def test_index_html_loads(page: Page, radicale_server: str, config: Config) -> None: """Test that the index.html loads from the server.""" console_msgs: list[str] = [] @@ -53,7 +50,9 @@ def test_index_html_loads(page: Page, radicale_server: str, config: Config) -> N assert len(errors) == 0 -@pytest.mark.parametrize("config", [SHARING_HTPASSWD, SHARING_XREMOTE, NOSHARE_HTPASSWD]) +@pytest.mark.parametrize( + "config", [SHARING_HTPASSWD, SHARING_XREMOTE, NOSHARE_HTPASSWD] +) def test_user_login_works( context: BrowserContext, page: Page, radicale_server: str, config: Config ) -> None: diff --git a/integ_tests/test_delete.py b/integ_tests/test_delete.py index cb1b9c87..3db6ba8f 100644 --- a/integ_tests/test_delete.py +++ b/integ_tests/test_delete.py @@ -24,15 +24,9 @@ from typing import Any, Generator import pytest from playwright.sync_api import BrowserContext, Page, expect -from integ_tests.common import ( - NOSHARE_HTPASSWD, - SHARING_HTPASSWD, - SHARING_XREMOTE, - Config, - create_collection, - login, - start_radicale_server, -) +from integ_tests.common import (NOSHARE_HTPASSWD, SHARING_HTPASSWD, + SHARING_XREMOTE, Config, create_collection, + login, start_radicale_server) @pytest.fixture @@ -42,7 +36,9 @@ def radicale_server( yield from start_radicale_server(tmp_path, config) -@pytest.mark.parametrize("config", [SHARING_HTPASSWD, SHARING_XREMOTE, NOSHARE_HTPASSWD]) +@pytest.mark.parametrize( + "config", [SHARING_HTPASSWD, SHARING_XREMOTE, NOSHARE_HTPASSWD] +) def test_delete_wrong_confirmation( context: BrowserContext, page: Page, radicale_server: str, config: Config ) -> None: @@ -68,7 +64,9 @@ def test_delete_wrong_confirmation( expect(page.locator("#deleteconfirmationscene")).to_be_visible() -@pytest.mark.parametrize("config", [SHARING_HTPASSWD, SHARING_XREMOTE, NOSHARE_HTPASSWD]) +@pytest.mark.parametrize( + "config", [SHARING_HTPASSWD, SHARING_XREMOTE, NOSHARE_HTPASSWD] +) def test_delete_correct_confirmation( context: BrowserContext, page: Page, radicale_server: str, config: Config ) -> None: diff --git a/integ_tests/test_download.py b/integ_tests/test_download.py index bcbd8544..3d0d9c63 100644 --- a/integ_tests/test_download.py +++ b/integ_tests/test_download.py @@ -18,19 +18,15 @@ Integration tests for download page """ +import pathlib from typing import Any, Generator import pytest from playwright.sync_api import BrowserContext, Page -from integ_tests.common import ( - NOSHARE_HTPASSWD, - SHARING_HTPASSWD, - SHARING_XREMOTE, - Config, - login, - start_radicale_server, -) +from integ_tests.common import (NOSHARE_HTPASSWD, SHARING_HTPASSWD, + SHARING_XREMOTE, Config, login, + start_radicale_server) @pytest.fixture( diff --git a/integ_tests/test_edit.py b/integ_tests/test_edit.py index 70b1b7f9..a42172a9 100644 --- a/integ_tests/test_edit.py +++ b/integ_tests/test_edit.py @@ -24,15 +24,9 @@ from typing import Any, Generator import pytest from playwright.sync_api import BrowserContext, Page, expect -from integ_tests.common import ( - NOSHARE_HTPASSWD, - SHARING_HTPASSWD, - SHARING_XREMOTE, - Config, - create_collection, - login, - start_radicale_server, -) +from integ_tests.common import (NOSHARE_HTPASSWD, SHARING_HTPASSWD, + SHARING_XREMOTE, Config, create_collection, + login, start_radicale_server) @pytest.fixture( diff --git a/integ_tests/test_scenes.py b/integ_tests/test_scenes.py index 67cb7d64..1fd30061 100644 --- a/integ_tests/test_scenes.py +++ b/integ_tests/test_scenes.py @@ -24,15 +24,9 @@ from typing import Any, Generator import pytest from playwright.sync_api import BrowserContext, Page, expect -from integ_tests.common import ( - NOSHARE_HTPASSWD, - SHARING_HTPASSWD, - SHARING_XREMOTE, - Config, - create_collection, - login, - start_radicale_server, -) +from integ_tests.common import (NOSHARE_HTPASSWD, SHARING_HTPASSWD, + SHARING_XREMOTE, Config, create_collection, + login, start_radicale_server) @pytest.fixture( diff --git a/integ_tests/test_scenes_login.py b/integ_tests/test_scenes_login.py index fec13bf7..cd472603 100644 --- a/integ_tests/test_scenes_login.py +++ b/integ_tests/test_scenes_login.py @@ -24,13 +24,8 @@ from typing import Any, Generator import pytest from playwright.sync_api import Page, expect -from integ_tests.common import ( - NOSHARE_HTPASSWD, - SHARING_HTPASSWD, - Config, - login, - start_radicale_server, -) +from integ_tests.common import (NOSHARE_HTPASSWD, SHARING_HTPASSWD, Config, + login, start_radicale_server) @pytest.fixture(params=[SHARING_HTPASSWD, NOSHARE_HTPASSWD], ids=lambda c: c.name) diff --git a/integ_tests/test_sharing.py b/integ_tests/test_sharing.py index 47dfb95d..267a2580 100644 --- a/integ_tests/test_sharing.py +++ b/integ_tests/test_sharing.py @@ -24,14 +24,9 @@ from typing import Any, Generator import pytest from playwright.sync_api import BrowserContext, Page, expect -from integ_tests.common import ( - SHARING_HTPASSWD, - SHARING_XREMOTE, - Config, - create_collection, - login, - start_radicale_server, -) +from integ_tests.common import (SHARING_HTPASSWD, SHARING_XREMOTE, Config, + create_collection, login, + start_radicale_server) @pytest.fixture(params=[SHARING_HTPASSWD, SHARING_XREMOTE], ids=lambda c: c.name) diff --git a/integ_tests/test_sharing_login.py b/integ_tests/test_sharing_login.py index bbabd895..fad534be 100644 --- a/integ_tests/test_sharing_login.py +++ b/integ_tests/test_sharing_login.py @@ -24,12 +24,8 @@ from typing import Any, Generator import pytest from playwright.sync_api import Page, expect -from integ_tests.common import ( - SHARING_HTPASSWD, - create_collection, - login, - start_radicale_server, -) +from integ_tests.common import (SHARING_HTPASSWD, create_collection, login, + start_radicale_server) @pytest.fixture diff --git a/integ_tests/test_upload.py b/integ_tests/test_upload.py index 876ae847..d37fb740 100644 --- a/integ_tests/test_upload.py +++ b/integ_tests/test_upload.py @@ -25,14 +25,9 @@ from typing import Any, Generator import pytest from playwright.sync_api import BrowserContext, Page, expect -from integ_tests.common import ( - NOSHARE_HTPASSWD, - SHARING_HTPASSWD, - SHARING_XREMOTE, - Config, - login, - start_radicale_server, -) +from integ_tests.common import (NOSHARE_HTPASSWD, SHARING_HTPASSWD, + SHARING_XREMOTE, Config, login, + start_radicale_server) @pytest.fixture(