diff options
Diffstat (limited to 'testenv')
| -rw-r--r-- | testenv/main.yaml | 8 | ||||
| -rw-r--r-- | testenv/tests/apps/htpasswd/test_main.py | 2 | ||||
| -rw-r--r-- | testenv/tests/apps/kvmd/test_auth.py | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/testenv/main.yaml b/testenv/main.yaml index 6c6c9bbd..4ff88d94 100644 --- a/testenv/main.yaml +++ b/testenv/main.yaml @@ -7,11 +7,9 @@ kvmd: auth: !include auth.yaml hid: - type: tty - params: - reset_pin: 4 - device: /dev/ttyS10 - noop: true + reset_pin: 4 + device: /dev/ttyS10 + noop: true atx: power_led_pin: 24 diff --git a/testenv/tests/apps/htpasswd/test_main.py b/testenv/tests/apps/htpasswd/test_main.py index 52a38640..dd1d9c8d 100644 --- a/testenv/tests/apps/htpasswd/test_main.py +++ b/testenv/tests/apps/htpasswd/test_main.py @@ -57,7 +57,7 @@ def _htpasswd_fixture(request) -> Generator[passlib.apache.HtpasswdFile, None, N def _run_htpasswd(cmd: List[str], htpasswd_path: str, internal_type: str="htpasswd") -> None: cmd = ["kvmd-htpasswd", *cmd, "--set-options"] if internal_type != "htpasswd": # By default - cmd.append("kvmd/auth/internal_type=" + internal_type) + cmd.append("kvmd/auth/internal/type=" + internal_type) if htpasswd_path: cmd.append("kvmd/auth/internal/file=" + htpasswd_path) main(cmd) diff --git a/testenv/tests/apps/kvmd/test_auth.py b/testenv/tests/apps/kvmd/test_auth.py index be6b6455..fca156ad 100644 --- a/testenv/tests/apps/kvmd/test_auth.py +++ b/testenv/tests/apps/kvmd/test_auth.py @@ -50,7 +50,7 @@ def _make_service_kwargs(path: str) -> Dict: async def _get_configured_manager( internal_path: str, external_path: str="", - internal_users: Optional[List[str]]=None, + force_internal_users: Optional[List[str]]=None, ) -> AsyncGenerator[AuthManager, None]: manager = AuthManager( @@ -58,7 +58,7 @@ async def _get_configured_manager( internal_kwargs=_make_service_kwargs(internal_path), external_type=("htpasswd" if external_path else ""), external_kwargs=(_make_service_kwargs(external_path) if external_path else {}), - internal_users=(internal_users or []), + force_internal_users=(force_internal_users or []), ) try: |