Fix some test names, import statements, and test formatting
Marco Ricci commited on 2025-12-24 10:37:29
Zeige 2 geänderte Dateien mit 12 Einfügungen und 9 Löschungen.
- tests/conftest.py f082c8c..9f0a754
- tests/test_derivepassphrase_cli/test_utils.py d58ec3e..245e1e5
| ... | ... |
@@ -8,6 +8,7 @@ import base64 |
| 8 | 8 |
import contextlib |
| 9 | 9 |
import datetime |
| 10 | 10 |
import importlib |
| 11 |
+import importlib.util |
|
| 11 | 12 |
import os |
| 12 | 13 |
import shutil |
| 13 | 14 |
import socket |
| ... | ... |
@@ -756,12 +757,14 @@ def ssh_agent_client_with_test_keys_loaded( # noqa: C901 |
| 756 | 757 |
current_loaded_keys = frozenset({
|
| 757 | 758 |
pair.key for pair in client.list_keys() |
| 758 | 759 |
}) |
| 759 |
- if agent_type == tests.data.KnownSSHAgent.Pageant and ( |
|
| 760 |
- key_struct.public_key_data in current_loaded_keys |
|
| 760 |
+ if ( |
|
| 761 |
+ agent_type == tests.data.KnownSSHAgent.Pageant |
|
| 762 |
+ and key_struct.public_key_data in current_loaded_keys |
|
| 761 | 763 |
): |
| 762 | 764 |
pass |
| 763 |
- elif agent_type == tests.data.KnownSSHAgent.Pageant and ( |
|
| 764 |
- not isolated |
|
| 765 |
+ elif ( |
|
| 766 |
+ agent_type == tests.data.KnownSSHAgent.Pageant |
|
| 767 |
+ and not isolated |
|
| 765 | 768 |
): |
| 766 | 769 |
request_code, payload = prepare_payload( |
| 767 | 770 |
private_key_data, isolated=True |
| ... | ... |
@@ -25,7 +25,7 @@ import types |
| 25 | 25 |
import warnings |
| 26 | 26 |
from typing import TYPE_CHECKING |
| 27 | 27 |
|
| 28 |
-import click.testing |
|
| 28 |
+import click |
|
| 29 | 29 |
import hypothesis |
| 30 | 30 |
import pytest |
| 31 | 31 |
from hypothesis import strategies |
| ... | ... |
@@ -500,7 +500,7 @@ class Parametrize(types.SimpleNamespace): |
| 500 | 500 |
SignAction.FAIL, |
| 501 | 501 |
"does not support communicating with it", |
| 502 | 502 |
[], |
| 503 |
- id="no-agent-support", |
|
| 503 |
+ id="no-native-agent-available", |
|
| 504 | 504 |
), |
| 505 | 505 |
pytest.param( |
| 506 | 506 |
None, |
| ... | ... |
@@ -509,7 +509,7 @@ class Parametrize(types.SimpleNamespace): |
| 509 | 509 |
SignAction.FAIL, |
| 510 | 510 |
"does not support communicating with it", |
| 511 | 511 |
[], |
| 512 |
- id="no-agent-support", |
|
| 512 |
+ id="no-agents-in-agent-provider-list", |
|
| 513 | 513 |
), |
| 514 | 514 |
pytest.param( |
| 515 | 515 |
None, |
| ... | ... |
@@ -518,7 +518,7 @@ class Parametrize(types.SimpleNamespace): |
| 518 | 518 |
SignAction.FAIL, |
| 519 | 519 |
"does not support communicating with it", |
| 520 | 520 |
["Cannot connect to an SSH agent via UNIX domain sockets"], |
| 521 |
- id="no-agent-support", |
|
| 521 |
+ id="no-unix-domain-sockets", |
|
| 522 | 522 |
), |
| 523 | 523 |
pytest.param( |
| 524 | 524 |
None, |
| ... | ... |
@@ -527,7 +527,7 @@ class Parametrize(types.SimpleNamespace): |
| 527 | 527 |
SignAction.FAIL, |
| 528 | 528 |
"does not support communicating with it", |
| 529 | 529 |
["Cannot connect to an SSH agent via Windows named pipes"], |
| 530 |
- id="no-agent-support", |
|
| 530 |
+ id="no-windows-named-pipes", |
|
| 531 | 531 |
), |
| 532 | 532 |
pytest.param( |
| 533 | 533 |
None, |
| 534 | 534 |