Use leaf module imports in all test modules (a513587) - derivepassphrase.git

Use leaf module imports in all test modules

Marco Ricci commited on 2025-08-09 15:12:40
Zeige 10 geänderte Dateien mit 496 Einfügungen und 504 Löschungen.

Instead of importing submodules and navigating to them via the top-level
module (`import spam.ham.eggs`), use leaf module imports (`from spam.ham
import eggs`).

Though there is sometimes the need to rename the imported module, doing
so leads to shorter expressions in general.  It also allows static
analysis tools to accurately detect whether a module is in use or not.
(Such a detection is much more murky if the whole module path needs to
be traversed each time.)

tests/test_000_testing_machinery.py 6744b5b..70c0504
tests/test_derivepassphrase_cli/__init__.py ea6dd8b..62fdf37
tests/test_derivepassphrase_cli/test_heavy_duty.py 7b50256..1e7ab67
tests/test_derivepassphrase_cli_export_vault.py 9cc2a7b..e608730
tests/test_derivepassphrase_exporter.py 2d37d71..438112e
tests/test_derivepassphrase_ssh_agent/__init__.py 2bd1baa..f742f1a
tests/test_derivepassphrase_ssh_agent/test_heavy_duty.py c8c781b..b703347
tests/test_derivepassphrase_types/__init__.py 236b5ba..90a23e0
tests/test_derivepassphrase_types/test_heavy_duty.py deaf4ad..2e01f6e
tests/test_derivepassphrase_vault.py 691ab75..61c4210

tests/test_000_testing_machinery.py

Zeige Datei @ a513587

@@ -8,8 +8,8 @@ import base64
 
 import pytest
 
-import tests.data
 from derivepassphrase import ssh_agent
+from tests import data
 
 OPENSSH_MAGIC = b"openssh-key-v1\x00"
 OPENSSH_HEADER = (
@@ -139,15 +139,15 @@ class Parametrize:
 
     TEST_KEYS = pytest.mark.parametrize(
         ["keyname", "key"],
-        tests.data.ALL_KEYS.items(),
-        ids=tests.data.ALL_KEYS.keys(),
+        data.ALL_KEYS.items(),
+        ids=data.ALL_KEYS.keys(),
     )
 
 
 @Parametrize.TEST_KEYS
 def test_100_test_keys_public_keys_are_internally_consistent(
     keyname: str,
-    key: tests.data.SSHTestKey,
+    key: data.SSHTestKey,
 ) -> None:
     """The test key public key data structures are internally consistent."""
     del keyname
@@ -163,7 +163,7 @@ def test_100_test_keys_public_keys_are_internally_consistent(
 @Parametrize.TEST_KEYS
 def test_101_test_keys_private_keys_are_consistent_with_public_keys(
     keyname: str,
-    key: tests.data.SSHTestKey,
+    key: data.SSHTestKey,
 ) -> None:
     """The test key private key data are consistent with their public parts."""
     del keyname
@@ -197,7 +197,7 @@ def test_101_test_keys_private_keys_are_consistent_with_public_keys(
 @Parametrize.TEST_KEYS
 def test_102_test_keys_private_keys_are_internally_consistent(
     keyname: str,
-    key: tests.data.SSHTestKey,
+    key: data.SSHTestKey,
 ) -> None:
     """The test key private key data structures are internally consistent."""
     del keyname

tests/test_derivepassphrase_cli/__init__.py

Zeige Datei @ a513587

@@ -33,11 +33,6 @@ import pytest
 from hypothesis import strategies
 from typing_extensions import Any, NamedTuple
 
-import tests.data
-import tests.data.callables
-import tests.machinery
-import tests.machinery.hypothesis
-import tests.machinery.pytest
 from derivepassphrase import _types, cli, ssh_agent, vault
 from derivepassphrase._internals import (
     cli_helpers,
@@ -45,6 +40,10 @@ from derivepassphrase._internals import (
     cli_messages,
 )
 from derivepassphrase.ssh_agent import socketprovider
+from tests import data, machinery
+from tests.data import callables
+from tests.machinery import hypothesis as hypothesis_machinery
+from tests.machinery import pytest as pytest_machinery
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterable, Iterator, Sequence
@@ -53,22 +52,22 @@ if TYPE_CHECKING:
 
     from typing_extensions import Literal
 
-DUMMY_SERVICE = tests.data.DUMMY_SERVICE
-DUMMY_PASSPHRASE = tests.data.DUMMY_PASSPHRASE
-DUMMY_CONFIG_SETTINGS = tests.data.DUMMY_CONFIG_SETTINGS
-DUMMY_RESULT_PASSPHRASE = tests.data.DUMMY_RESULT_PASSPHRASE
-DUMMY_RESULT_KEY1 = tests.data.DUMMY_RESULT_KEY1
-DUMMY_PHRASE_FROM_KEY1_RAW = tests.data.DUMMY_PHRASE_FROM_KEY1_RAW
-DUMMY_PHRASE_FROM_KEY1 = tests.data.DUMMY_PHRASE_FROM_KEY1
+DUMMY_SERVICE = data.DUMMY_SERVICE
+DUMMY_PASSPHRASE = data.DUMMY_PASSPHRASE
+DUMMY_CONFIG_SETTINGS = data.DUMMY_CONFIG_SETTINGS
+DUMMY_RESULT_PASSPHRASE = data.DUMMY_RESULT_PASSPHRASE
+DUMMY_RESULT_KEY1 = data.DUMMY_RESULT_KEY1
+DUMMY_PHRASE_FROM_KEY1_RAW = data.DUMMY_PHRASE_FROM_KEY1_RAW
+DUMMY_PHRASE_FROM_KEY1 = data.DUMMY_PHRASE_FROM_KEY1
 
-DUMMY_KEY1 = tests.data.DUMMY_KEY1
-DUMMY_KEY1_B64 = tests.data.DUMMY_KEY1_B64
-DUMMY_KEY2 = tests.data.DUMMY_KEY2
-DUMMY_KEY2_B64 = tests.data.DUMMY_KEY2_B64
-DUMMY_KEY3 = tests.data.DUMMY_KEY3
-DUMMY_KEY3_B64 = tests.data.DUMMY_KEY3_B64
+DUMMY_KEY1 = data.DUMMY_KEY1
+DUMMY_KEY1_B64 = data.DUMMY_KEY1_B64
+DUMMY_KEY2 = data.DUMMY_KEY2
+DUMMY_KEY2_B64 = data.DUMMY_KEY2_B64
+DUMMY_KEY3 = data.DUMMY_KEY3
+DUMMY_KEY3_B64 = data.DUMMY_KEY3_B64
 
-TEST_CONFIGS = tests.data.TEST_CONFIGS
+TEST_CONFIGS = data.TEST_CONFIGS
 
 
 class IncompatibleConfiguration(NamedTuple):
@@ -277,7 +276,7 @@ def is_harmless_config_import_warning(record: tuple[str, int, str]) -> bool:
         ),
     ]
     return any(
-        tests.machinery.warning_emitted(w, [record]) for w in possible_warnings
+        machinery.warning_emitted(w, [record]) for w in possible_warnings
     )
 
 
@@ -327,8 +326,8 @@ def vault_config_exporter_shell_interpreter(  # noqa: C901
     *,
     prog_name_list: list[str] | None = None,
     command: click.BaseCommand | None = None,
-    runner: tests.machinery.CliRunner | None = None,
-) -> Iterator[tests.machinery.ReadableResult]:
+    runner: machinery.CliRunner | None = None,
+) -> Iterator[machinery.ReadableResult]:
     """A rudimentary sh(1) interpreter for `--export-as=sh` output.
 
     Assumes a script as emitted by `derivepassphrase vault
@@ -345,7 +344,7 @@ def vault_config_exporter_shell_interpreter(  # noqa: C901
     if command is None:  # pragma: no cover
         command = cli.derivepassphrase_vault
     if runner is None:  # pragma: no cover
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
     n = len(prog_name_list)
     it = iter(script)
     while True:
@@ -2015,14 +2014,14 @@ class TestAllCLI:
         TODO: Do we actually need this?  What should we check for?
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2044,14 +2043,14 @@ class TestAllCLI:
         TODO: Do we actually need this?  What should we check for?
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2075,14 +2074,14 @@ class TestAllCLI:
         TODO: Do we actually need this?  What should we check for?
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2106,14 +2105,14 @@ class TestAllCLI:
         TODO: Do we actually need this?  What should we check for?
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2139,14 +2138,14 @@ class TestAllCLI:
         non_eager_arguments: list[str],
     ) -> None:
         """Eager options terminate option and argument processing."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2174,14 +2173,14 @@ class TestAllCLI:
 
         """
         color = False
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2215,14 +2214,14 @@ class TestAllCLI:
         subcommands.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2256,14 +2255,14 @@ class TestAllCLI:
         of subcommands.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2304,14 +2303,14 @@ class TestAllCLI:
         configuration formats, and a list of available PEP 508 extras.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2359,14 +2358,14 @@ class TestAllCLI:
         first paragraph.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2411,14 +2410,14 @@ class TestCLI:
         self,
     ) -> None:
         """The `--help` option emits help text."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2441,14 +2440,14 @@ class TestCLI:
         self,
     ) -> None:
         """The `--version` option emits version information."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2473,14 +2472,14 @@ class TestCLI:
         """Named character classes can be disabled on the command-line."""
         option = f"--{charset_name}"
         charset = vault.Vault.CHARSETS[charset_name].decode("ascii")
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2488,7 +2487,7 @@ class TestCLI:
             monkeypatch.setattr(
                 cli_helpers,
                 "prompt_for_passphrase",
-                tests.data.callables.auto_prompt,
+                callables.auto_prompt,
             )
             result = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -2506,14 +2505,14 @@ class TestCLI:
         self,
     ) -> None:
         """Character repetition can be disabled on the command-line."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2521,7 +2520,7 @@ class TestCLI:
             monkeypatch.setattr(
                 cli_helpers,
                 "prompt_for_passphrase",
-                tests.data.callables.auto_prompt,
+                callables.auto_prompt,
             )
             result = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -2542,19 +2541,19 @@ class TestCLI:
     @Parametrize.CONFIG_WITH_KEY
     def test_204a_key_from_config(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
         config: _types.VaultConfig,
     ) -> None:
         """A stored configured SSH key will be used."""
         del running_ssh_agent
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
@@ -2563,7 +2562,7 @@ class TestCLI:
             monkeypatch.setattr(
                 vault.Vault,
                 "phrase_from_key",
-                tests.data.callables.phrase_from_key,
+                callables.phrase_from_key,
             )
             result = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -2584,18 +2583,18 @@ class TestCLI:
 
     def test_204b_key_from_command_line(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
     ) -> None:
         """An SSH key requested on the command-line will be used."""
         del running_ssh_agent
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
@@ -2606,12 +2605,12 @@ class TestCLI:
             monkeypatch.setattr(
                 cli_helpers,
                 "get_suitable_ssh_keys",
-                tests.data.callables.suitable_ssh_keys,
+                callables.suitable_ssh_keys,
             )
             monkeypatch.setattr(
                 vault.Vault,
                 "phrase_from_key",
-                tests.data.callables.phrase_from_key,
+                callables.phrase_from_key,
             )
             result = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -2633,20 +2632,20 @@ class TestCLI:
     @Parametrize.KEY_INDEX
     def test_204c_key_override_on_command_line(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
         config: dict[str, Any],
         key_index: int,
     ) -> None:
         """A command-line SSH key will override the configured key."""
         del running_ssh_agent
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
@@ -2655,10 +2654,10 @@ class TestCLI:
             monkeypatch.setattr(
                 ssh_agent.SSHAgentClient,
                 "list_keys",
-                tests.data.callables.list_keys,
+                callables.list_keys,
             )
             monkeypatch.setattr(
-                ssh_agent.SSHAgentClient, "sign", tests.data.callables.sign
+                ssh_agent.SSHAgentClient, "sign", callables.sign
             )
             result = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -2674,18 +2673,18 @@ class TestCLI:
 
     def test_205_service_phrase_if_key_in_global_config(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
     ) -> None:
         """A command-line passphrase will override the configured key."""
         del running_ssh_agent
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
@@ -2702,10 +2701,10 @@ class TestCLI:
             monkeypatch.setattr(
                 ssh_agent.SSHAgentClient,
                 "list_keys",
-                tests.data.callables.list_keys,
+                callables.list_keys,
             )
             monkeypatch.setattr(
-                ssh_agent.SSHAgentClient, "sign", tests.data.callables.sign
+                ssh_agent.SSHAgentClient, "sign", callables.sign
             )
             result = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -2725,21 +2724,21 @@ class TestCLI:
     @Parametrize.KEY_OVERRIDING_IN_CONFIG
     def test_206_setting_phrase_thus_overriding_key_in_config(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
         caplog: pytest.LogCaptureFixture,
         config: _types.VaultConfig,
         command_line: list[str],
     ) -> None:
         """Configuring a passphrase atop an SSH key works, but warns."""
         del running_ssh_agent
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
@@ -2748,10 +2747,10 @@ class TestCLI:
             monkeypatch.setattr(
                 ssh_agent.SSHAgentClient,
                 "list_keys",
-                tests.data.callables.list_keys,
+                callables.list_keys,
             )
             monkeypatch.setattr(
-                ssh_agent.SSHAgentClient, "sign", tests.data.callables.sign
+                ssh_agent.SSHAgentClient, "sign", callables.sign
             )
             result = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -2764,10 +2763,10 @@ class TestCLI:
         assert result.stderr, "expected known error output"
         err_lines = result.stderr.splitlines(False)
         assert err_lines[0].startswith("Passphrase:")
-        assert tests.machinery.warning_emitted(
+        assert machinery.warning_emitted(
             "Setting a service passphrase is ineffective ",
             caplog.record_tuples,
-        ) or tests.machinery.warning_emitted(
+        ) or machinery.warning_emitted(
             "Setting a global passphrase is ineffective ",
             caplog.record_tuples,
         ), "expected known warning message"
@@ -2792,14 +2791,14 @@ class TestCLI:
     ) -> None:
         """Service notes are printed, if they exist."""
         hypothesis.assume("Error:" not in notes)
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
@@ -2838,14 +2837,14 @@ class TestCLI:
         option: str,
     ) -> None:
         """Requesting invalidly many characters from a class fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -2870,14 +2869,14 @@ class TestCLI:
         check_success: bool,
     ) -> None:
         """We require or forbid a service argument, depending on options."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"global": {"phrase": "abc"}, "services": {}},
@@ -2886,7 +2885,7 @@ class TestCLI:
             monkeypatch.setattr(
                 cli_helpers,
                 "prompt_for_passphrase",
-                tests.data.callables.auto_prompt,
+                callables.auto_prompt,
             )
             result = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -2914,7 +2913,7 @@ class TestCLI:
             with contextlib.ExitStack() as stack:
                 monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
                 stack.enter_context(
-                    tests.machinery.pytest.isolated_vault_config(
+                    pytest_machinery.isolated_vault_config(
                         monkeypatch=monkeypatch,
                         runner=runner,
                         vault_config={
@@ -2926,7 +2925,7 @@ class TestCLI:
                 monkeypatch.setattr(
                     cli_helpers,
                     "prompt_for_passphrase",
-                    tests.data.callables.auto_prompt,
+                    callables.auto_prompt,
                 )
                 result = runner.invoke(
                     cli.derivepassphrase_vault,
@@ -2949,18 +2948,18 @@ class TestCLI:
         def is_expected_warning(record: tuple[str, int, str]) -> bool:
             return is_harmless_config_import_warning(
                 record
-            ) or tests.machinery.warning_emitted(
+            ) or machinery.warning_emitted(
                 "An empty SERVICE is not supported by vault(1)", [record]
             )
 
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"services": {}},
@@ -2969,7 +2968,7 @@ class TestCLI:
             monkeypatch.setattr(
                 cli_helpers,
                 "prompt_for_passphrase",
-                tests.data.callables.auto_prompt,
+                callables.auto_prompt,
             )
             result = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -3009,14 +3008,14 @@ class TestCLI:
         service: bool | None,
     ) -> None:
         """Incompatible options are detected."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -3038,14 +3037,14 @@ class TestCLI:
         config: Any,
     ) -> None:
         """Importing a configuration works."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"services": {}},
@@ -3075,16 +3074,16 @@ class TestCLI:
         ],
     )
     @hypothesis.given(
-        conf=tests.machinery.hypothesis.smudged_vault_test_config(
+        conf=hypothesis_machinery.smudged_vault_test_config(
             strategies.sampled_from([
-                conf for conf in tests.data.TEST_CONFIGS if conf.is_valid()
+                conf for conf in data.TEST_CONFIGS if conf.is_valid()
             ])
         )
     )
     def test_213a_import_config_success(
         self,
         caplog: pytest.LogCaptureFixture,
-        conf: tests.data.VaultTestConfig,
+        conf: data.VaultTestConfig,
     ) -> None:
         """Importing a smudged configuration works.
 
@@ -3096,14 +3095,14 @@ class TestCLI:
         _types.clean_up_falsy_vault_config_values(config2)
         # Reset caplog between hypothesis runs.
         caplog.clear()
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"services": {}},
@@ -3130,14 +3129,14 @@ class TestCLI:
         self,
     ) -> None:
         """Importing an invalid config fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -3156,14 +3155,14 @@ class TestCLI:
         self,
     ) -> None:
         """Importing an invalid config fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -3182,7 +3181,7 @@ class TestCLI:
         self,
     ) -> None:
         """Importing an invalid config fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # `isolated_vault_config` ensures the configuration is valid
         # JSON.  So, to pass an actual broken configuration, we must
         # open the configuration file ourselves afterwards, inside the
@@ -3194,7 +3193,7 @@ class TestCLI:
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"services": {}},
@@ -3223,14 +3222,14 @@ class TestCLI:
         config: Any,
     ) -> None:
         """Exporting a configuration works."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
@@ -3263,14 +3262,14 @@ class TestCLI:
         export_options: list[str],
     ) -> None:
         """Exporting the default, empty config works."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -3295,14 +3294,14 @@ class TestCLI:
         export_options: list[str],
     ) -> None:
         """Exporting an invalid config fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={},
@@ -3324,14 +3323,14 @@ class TestCLI:
         export_options: list[str],
     ) -> None:
         """Exporting an invalid config fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -3355,14 +3354,14 @@ class TestCLI:
         export_options: list[str],
     ) -> None:
         """Exporting an invalid config fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -3378,21 +3377,21 @@ class TestCLI:
             "expected error exit and known error message"
         )
 
-    @tests.machinery.pytest.skip_if_on_the_annoying_os
+    @pytest_machinery.skip_if_on_the_annoying_os
     @Parametrize.EXPORT_FORMAT_OPTIONS
     def test_214e_export_settings_settings_directory_not_a_directory(
         self,
         export_options: list[str],
     ) -> None:
         """Exporting an invalid config fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -3443,14 +3442,14 @@ class TestCLI:
             if notes_placement == "before"
             else f"{result_phrase}\n\n{notes}\n\n"
         )
-        runner = tests.machinery.CliRunner(mix_stderr=True)
+        runner = machinery.CliRunner(mix_stderr=True)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=vault_config,
@@ -3496,14 +3495,14 @@ class TestCLI:
 """
         # Reset caplog between hypothesis runs.
         caplog.clear()
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
@@ -3535,7 +3534,7 @@ class TestCLI:
             )
             assert result.clean_exit(), "expected clean exit"
             assert all(map(is_warning_line, result.stderr.splitlines(True)))
-            assert modern_editor_interface or tests.machinery.warning_emitted(
+            assert modern_editor_interface or machinery.warning_emitted(
                 "A backup copy of the old notes was saved",
                 caplog.record_tuples,
             ), "expected known warning message in stderr"
@@ -3586,14 +3585,14 @@ class TestCLI:
             return "       " + notes.strip() + "\n\n\n\n\n\n"
 
         edit_funcs = {"empty": empty, "space": space}
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
@@ -3675,14 +3674,14 @@ class TestCLI:
         hypothesis.assume(str(notes_marker) not in notes.strip())
         # Reset caplog between hypothesis runs.
         caplog.clear()
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
@@ -3716,7 +3715,7 @@ class TestCLI:
             assert not result.stderr or all(
                 map(is_warning_line, result.stderr.splitlines(True))
             )
-            assert not caplog.record_tuples or tests.machinery.warning_emitted(
+            assert not caplog.record_tuples or machinery.warning_emitted(
                 "A backup copy of the old notes was saved",
                 caplog.record_tuples,
             ), "expected known warning message in stderr"
@@ -3752,14 +3751,14 @@ class TestCLI:
         Aborting is only supported with the modern editor interface.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
@@ -3800,14 +3799,14 @@ class TestCLI:
         Aborting is only supported with the modern editor interface.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
@@ -3871,14 +3870,14 @@ class TestCLI:
         }
         # Reset caplog between hypothesis runs.
         caplog.clear()
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=vault_config,
@@ -3919,7 +3918,7 @@ class TestCLI:
                 for line in result.stderr.splitlines(True)
                 if line.startswith(f"{cli.PROG_NAME}: ")
             )
-            assert tests.machinery.warning_emitted(
+            assert machinery.warning_emitted(
                 "Specifying --notes without --config is ineffective.  "
                 "No notes will be edited.",
                 caplog.record_tuples,
@@ -3948,14 +3947,14 @@ class TestCLI:
         the config more readable.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"global": {"phrase": "abc"}, "services": {}},
@@ -3964,7 +3963,7 @@ class TestCLI:
             monkeypatch.setattr(
                 cli_helpers,
                 "get_suitable_ssh_keys",
-                tests.data.callables.suitable_ssh_keys,
+                callables.suitable_ssh_keys,
             )
             result = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -3990,14 +3989,14 @@ class TestCLI:
         err_text: str,
     ) -> None:
         """Storing invalid settings via `--config` fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"global": {"phrase": "abc"}, "services": {}},
@@ -4006,7 +4005,7 @@ class TestCLI:
             monkeypatch.setattr(
                 cli_helpers,
                 "get_suitable_ssh_keys",
-                tests.data.callables.suitable_ssh_keys,
+                callables.suitable_ssh_keys,
             )
             result = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -4020,18 +4019,18 @@ class TestCLI:
 
     def test_225a_store_config_fail_manual_no_ssh_key_selection(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
     ) -> None:
         """Not selecting an SSH key during `--config --key` fails."""
         del running_ssh_agent
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"global": {"phrase": "abc"}, "services": {}},
@@ -4049,7 +4048,7 @@ class TestCLI:
             monkeypatch.setattr(
                 cli_helpers,
                 "get_suitable_ssh_keys",
-                tests.data.callables.suitable_ssh_keys,
+                callables.suitable_ssh_keys,
             )
             result = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -4062,18 +4061,18 @@ class TestCLI:
 
     def test_225b_store_config_fail_manual_no_ssh_agent(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
     ) -> None:
         """Not running an SSH agent during `--config --key` fails."""
         del running_ssh_agent
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"global": {"phrase": "abc"}, "services": {}},
@@ -4091,18 +4090,18 @@ class TestCLI:
 
     def test_225c_store_config_fail_manual_bad_ssh_agent_connection(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
     ) -> None:
         """Not running a reachable SSH agent during `--config --key` fails."""
         running_ssh_agent.require_external_address()
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"global": {"phrase": "abc"}, "services": {}},
@@ -4125,20 +4124,20 @@ class TestCLI:
         try_race_free_implementation: bool,
     ) -> None:
         """Using a read-only configuration file with `--config` fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"global": {"phrase": "abc"}, "services": {}},
                 )
             )
-            tests.data.callables.make_file_readonly(
+            callables.make_file_readonly(
                 cli_helpers.config_filename(subsystem="vault"),
                 try_race_free_implementation=try_race_free_implementation,
             )
@@ -4155,14 +4154,14 @@ class TestCLI:
         self,
     ) -> None:
         """OS-erroring with `--config` fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"global": {"phrase": "abc"}, "services": {}},
@@ -4188,14 +4187,14 @@ class TestCLI:
         self,
     ) -> None:
         """Issuing conflicting settings to `--config` fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"global": {"phrase": "abc"}, "services": {}},
@@ -4218,18 +4217,18 @@ class TestCLI:
 
     def test_225g_store_config_fail_manual_ssh_agent_no_keys_loaded(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
     ) -> None:
         """Not holding any SSH keys during `--config --key` fails."""
         del running_ssh_agent
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"global": {"phrase": "abc"}, "services": {}},
@@ -4254,18 +4253,18 @@ class TestCLI:
 
     def test_225h_store_config_fail_manual_ssh_agent_runtime_error(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
     ) -> None:
         """The SSH agent erroring during `--config --key` fails."""
         del running_ssh_agent
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"global": {"phrase": "abc"}, "services": {}},
@@ -4287,18 +4286,18 @@ class TestCLI:
 
     def test_225i_store_config_fail_manual_ssh_agent_refuses(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
     ) -> None:
         """The SSH agent refusing during `--config --key` fails."""
         del running_ssh_agent
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"global": {"phrase": "abc"}, "services": {}},
@@ -4322,14 +4321,14 @@ class TestCLI:
 
     def test_226_no_arguments(self) -> None:
         """Calling `derivepassphrase vault` without any arguments fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -4345,14 +4344,14 @@ class TestCLI:
         self,
     ) -> None:
         """Deriving a passphrase without a passphrase or key fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -4376,14 +4375,14 @@ class TestCLI:
         [issue #6]: https://github.com/the-13th-letter/derivepassphrase/issues/6
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -4422,14 +4421,14 @@ class TestCLI:
         [issue #6]: https://github.com/the-13th-letter/derivepassphrase/issues/6
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -4461,14 +4460,14 @@ class TestCLI:
         self,
     ) -> None:
         """Storing the configuration reacts even to weird errors."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -4500,14 +4499,14 @@ class TestCLI:
         warning_message: str,
     ) -> None:
         """Using unnormalized Unicode passphrases warns."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
@@ -4525,7 +4524,7 @@ class TestCLI:
                 input=input,
             )
         assert result.clean_exit(), "expected clean exit"
-        assert tests.machinery.warning_emitted(
+        assert machinery.warning_emitted(
             warning_message, caplog.record_tuples
         ), "expected known warning message in stderr"
 
@@ -4538,14 +4537,14 @@ class TestCLI:
         error_message: str,
     ) -> None:
         """Using unknown Unicode normalization forms fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
@@ -4575,14 +4574,14 @@ class TestCLI:
         command_line: list[str],
     ) -> None:
         """Using unknown Unicode normalization forms in the config fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
@@ -4615,14 +4614,14 @@ class TestCLI:
         self,
     ) -> None:
         """Loading a user configuration file in an invalid format fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"services": {}},
@@ -4643,14 +4642,14 @@ class TestCLI:
         self,
     ) -> None:
         """Loading a user configuration file in an invalid format fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"services": {}},
@@ -4677,14 +4676,14 @@ class TestCLI:
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Querying the SSH agent without `AF_UNIX` support fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"global": {"phrase": "abc"}, "services": {}},
@@ -4705,7 +4704,7 @@ class TestCLI:
         assert result.error_exit(
             error="does not support communicating with it"
         ), "expected error exit and known error message"
-        assert tests.machinery.warning_emitted(
+        assert machinery.warning_emitted(
             "Cannot connect to an SSH agent via UNIX domain sockets",
             caplog.record_tuples,
         ), "expected known warning message in stderr"
@@ -4720,14 +4719,14 @@ class TestCLIUtils:
         config: Any,
     ) -> None:
         """[`cli_helpers.load_config`][] works for valid configurations."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
@@ -4742,14 +4741,14 @@ class TestCLIUtils:
         self,
     ) -> None:
         """[`cli_helpers.save_config`][] fails for bad configurations."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={},
@@ -4792,7 +4791,7 @@ class TestCLIUtils:
             click.echo(items[index])
             click.echo("(Note: Vikings strictly optional.)")
 
-        runner = tests.machinery.CliRunner(mix_stderr=True)
+        runner = machinery.CliRunner(mix_stderr=True)
         result = runner.invoke(driver, [], input="9")
         assert result.clean_exit(
             output="""\
@@ -4889,7 +4888,7 @@ Your selection? (1-10, leave empty to abort): """,
             else:
                 click.echo("Great!")
 
-        runner = tests.machinery.CliRunner(mix_stderr=True)
+        runner = machinery.CliRunner(mix_stderr=True)
         result = runner.invoke(
             driver, ["Will replace with spam. Confirm, y/n?"], input="y"
         )
@@ -5104,14 +5103,14 @@ Will replace with spam, okay? (Please say "y" or "n".): Boo.
                 config, outfile=outfile, prog_name_list=prog_name_list
             )
             script = outfile.getvalue()
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"services": {}},
@@ -5122,7 +5121,7 @@ Will replace with spam, okay? (Please say "y" or "n".): Boo.
             assert cli_helpers.load_config() == config
 
     @hypothesis.given(
-        global_config_settable=tests.machinery.hypothesis.vault_full_service_config(),
+        global_config_settable=hypothesis_machinery.vault_full_service_config(),
         global_config_importable=strategies.fixed_dictionaries(
             {},
             optional={
@@ -5217,7 +5216,7 @@ Will replace with spam, okay? (Please say "y" or "n".): Boo.
             min_size=4,
             max_size=64,
         ),
-        service_config_settable=tests.machinery.hypothesis.vault_full_service_config(),
+        service_config_settable=hypothesis_machinery.vault_full_service_config(),
         service_config_importable=strategies.fixed_dictionaries(
             {},
             optional={
@@ -5374,14 +5373,14 @@ Will replace with spam, okay? (Please say "y" or "n".): Boo.
             finally:
                 shutil.rmtree(path)
 
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"services": {}},
@@ -5404,7 +5403,7 @@ Will replace with spam, okay? (Please say "y" or "n".): Boo.
             system_tempdir = os.fsdecode(tempfile.gettempdir())
             our_tempdir = cli_helpers.get_tempdir()
             assert system_tempdir == os.fsdecode(our_tempdir) or (
-                # TODO(the-13th-letter): `tests.machinery.pytest.isolated_config`
+                # TODO(the-13th-letter): `pytest_machinery.isolated_config`
                 # guarantees that `Path.cwd() == config_filename(None)`.
                 # So this sub-branch ought to never trigger in our
                 # tests.
@@ -5421,14 +5420,14 @@ Will replace with spam, okay? (Please say "y" or "n".): Boo.
         configuration directory.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"services": {}},
@@ -5476,14 +5475,14 @@ Will replace with spam, okay? (Please say "y" or "n".): Boo.
     ) -> None:
         """Repeatedly removing the same parts of a configuration works."""
         for start_config in [config, result_config]:
-            runner = tests.machinery.CliRunner(mix_stderr=False)
+            runner = machinery.CliRunner(mix_stderr=False)
             # TODO(the-13th-letter): Rewrite using parenthesized
             # with-statements.
             # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
             with contextlib.ExitStack() as stack:
                 monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
                 stack.enter_context(
-                    tests.machinery.pytest.isolated_vault_config(
+                    pytest_machinery.isolated_vault_config(
                         monkeypatch=monkeypatch,
                         runner=runner,
                         vault_config=start_config,
@@ -5526,7 +5525,7 @@ Will replace with spam, okay? (Please say "y" or "n".): Boo.
     @Parametrize.CONNECTION_HINTS
     def test_227_get_suitable_ssh_keys(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
         conn_hint: str,
     ) -> None:
         """[`cli_helpers.get_suitable_ssh_keys`][] works."""
@@ -5534,7 +5533,7 @@ Will replace with spam, okay? (Please say "y" or "n".): Boo.
             monkeypatch.setattr(
                 ssh_agent.SSHAgentClient,
                 "list_keys",
-                tests.data.callables.list_keys,
+                callables.list_keys,
             )
             hint: ssh_agent.SSHAgentClient | _types.SSHAgentSocket | None
             # TODO(the-13th-letter): Rewrite using structural pattern
@@ -5629,14 +5628,14 @@ class TestCLITransition:
         config: Any,
     ) -> None:
         """Loading the old settings file works."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -5652,14 +5651,14 @@ class TestCLITransition:
         config: Any,
     ) -> None:
         """Migrating the old settings file works."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -5675,14 +5674,14 @@ class TestCLITransition:
         config: Any,
     ) -> None:
         """Migrating the old settings file atop a directory fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -5705,14 +5704,14 @@ class TestCLITransition:
         config: Any,
     ) -> None:
         """Migrating an invalid old settings file fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -5731,33 +5730,33 @@ class TestCLITransition:
     ) -> None:
         """Forwarding arguments from "export" to "export vault" works."""
         pytest.importorskip("cryptography", minversion="38.0")
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-                    vault_config=tests.data.VAULT_V03_CONFIG,
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_config=data.VAULT_V03_CONFIG,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
-            monkeypatch.setenv("VAULT_KEY", tests.data.VAULT_MASTER_KEY)
+            monkeypatch.setenv("VAULT_KEY", data.VAULT_MASTER_KEY)
             result = runner.invoke(
                 cli.derivepassphrase,
                 ["export", "VAULT_PATH"],
             )
         assert result.clean_exit(empty_stderr=False), "expected clean exit"
-        assert tests.machinery.deprecation_warning_emitted(
+        assert machinery.deprecation_warning_emitted(
             "A subcommand will be required here in v1.0", caplog.record_tuples
         )
-        assert tests.machinery.deprecation_warning_emitted(
+        assert machinery.deprecation_warning_emitted(
             'Defaulting to subcommand "vault"', caplog.record_tuples
         )
-        assert json.loads(result.stdout) == tests.data.VAULT_V03_CONFIG_DATA
+        assert json.loads(result.stdout) == data.VAULT_V03_CONFIG_DATA
 
     def test_201_forward_export_vault_empty_commandline(
         self,
@@ -5765,14 +5764,14 @@ class TestCLITransition:
     ) -> None:
         """Deferring from "export" to "export vault" works."""
         pytest.importorskip("cryptography", minversion="38.0")
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -5781,10 +5780,10 @@ class TestCLITransition:
                 cli.derivepassphrase,
                 ["export"],
             )
-        assert tests.machinery.deprecation_warning_emitted(
+        assert machinery.deprecation_warning_emitted(
             "A subcommand will be required here in v1.0", caplog.record_tuples
         )
-        assert tests.machinery.deprecation_warning_emitted(
+        assert machinery.deprecation_warning_emitted(
             'Defaulting to subcommand "vault"', caplog.record_tuples
         )
         assert result.error_exit(error="Missing argument 'PATH'"), (
@@ -5800,14 +5799,14 @@ class TestCLITransition:
         """Forwarding arguments from top-level to "vault" works."""
         option = f"--{charset_name}"
         charset = vault.Vault.CHARSETS[charset_name].decode("ascii")
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -5815,7 +5814,7 @@ class TestCLITransition:
             monkeypatch.setattr(
                 cli_helpers,
                 "prompt_for_passphrase",
-                tests.data.callables.auto_prompt,
+                callables.auto_prompt,
             )
             result = runner.invoke(
                 cli.derivepassphrase,
@@ -5824,10 +5823,10 @@ class TestCLITransition:
                 catch_exceptions=False,
             )
         assert result.clean_exit(empty_stderr=False), "expected clean exit"
-        assert tests.machinery.deprecation_warning_emitted(
+        assert machinery.deprecation_warning_emitted(
             "A subcommand will be required here in v1.0", caplog.record_tuples
         )
-        assert tests.machinery.deprecation_warning_emitted(
+        assert machinery.deprecation_warning_emitted(
             'Defaulting to subcommand "vault"', caplog.record_tuples
         )
         for c in charset:
@@ -5840,14 +5839,14 @@ class TestCLITransition:
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Deferring from top-level to "vault" works."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -5858,10 +5857,10 @@ class TestCLITransition:
                 input=DUMMY_PASSPHRASE,
                 catch_exceptions=False,
             )
-        assert tests.machinery.deprecation_warning_emitted(
+        assert machinery.deprecation_warning_emitted(
             "A subcommand will be required here in v1.0", caplog.record_tuples
         )
-        assert tests.machinery.deprecation_warning_emitted(
+        assert machinery.deprecation_warning_emitted(
             'Defaulting to subcommand "vault"', caplog.record_tuples
         )
         assert result.error_exit(
@@ -5874,14 +5873,14 @@ class TestCLITransition:
     ) -> None:
         """Exporting from (and migrating) the old settings file works."""
         caplog.set_level(logging.INFO)
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -5902,10 +5901,10 @@ class TestCLITransition:
                 catch_exceptions=False,
             )
         assert result.clean_exit(), "expected clean exit"
-        assert tests.machinery.deprecation_warning_emitted(
+        assert machinery.deprecation_warning_emitted(
             "v0.1-style config file", caplog.record_tuples
         ), "expected known warning message in stderr"
-        assert tests.machinery.deprecation_info_emitted(
+        assert machinery.deprecation_info_emitted(
             "Successfully migrated to ", caplog.record_tuples
         ), "expected known warning message in stderr"
 
@@ -5914,14 +5913,14 @@ class TestCLITransition:
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Exporting from (and not migrating) the old settings file fails."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_config(
+                pytest_machinery.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                 )
@@ -5952,10 +5951,10 @@ class TestCLITransition:
                 catch_exceptions=False,
             )
         assert result.clean_exit(), "expected clean exit"
-        assert tests.machinery.deprecation_warning_emitted(
+        assert machinery.deprecation_warning_emitted(
             "v0.1-style config file", caplog.record_tuples
         ), "expected known warning message in stderr"
-        assert tests.machinery.warning_emitted(
+        assert machinery.warning_emitted(
             "Failed to migrate to ", caplog.record_tuples
         ), "expected known warning message in stderr"
 
@@ -5964,14 +5963,14 @@ class TestCLITransition:
     ) -> None:
         """Completing service names from the old settings file works."""
         config = {"services": {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS.copy()}}
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
@@ -6106,14 +6105,14 @@ class TestShellCompletion:
         completions: AbstractSet[str],
     ) -> None:
         """Our completion machinery works for vault service names."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
@@ -6138,14 +6137,14 @@ class TestShellCompletion:
         results: list[str | click.shell_completion.CompletionItem],
     ) -> None:
         """Custom completion functions work for all shells."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
@@ -6200,14 +6199,14 @@ class TestShellCompletion:
     ) -> None:
         """Completion skips incompletable items."""
         vault_config = config if mode == "config" else {"services": {}}
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=vault_config,
@@ -6227,10 +6226,10 @@ class TestShellCompletion:
                     input=json.dumps(config),
                 )
             assert result.clean_exit(), "expected clean exit"
-            assert tests.machinery.warning_emitted(
+            assert machinery.warning_emitted(
                 "contains an ASCII control character", caplog.record_tuples
             ), "expected known warning message in stderr"
-            assert tests.machinery.warning_emitted(
+            assert machinery.warning_emitted(
                 "not be available for completion", caplog.record_tuples
             ), "expected known warning message in stderr"
             assert cli_helpers.load_config() == config
@@ -6241,14 +6240,14 @@ class TestShellCompletion:
         self,
     ) -> None:
         """Service name completion quietly fails on missing configuration."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
@@ -6271,14 +6270,14 @@ class TestShellCompletion:
         exc_type: type[Exception],
     ) -> None:
         """Service name completion quietly fails on configuration errors."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={

tests/test_derivepassphrase_cli/test_heavy_duty.py

Zeige Datei @ a513587

@@ -18,13 +18,11 @@ import pytest
 from hypothesis import stateful, strategies
 from typing_extensions import Any, NamedTuple, TypeAlias
 
-import tests.data
-import tests.data.callables
-import tests.machinery
-import tests.machinery.hypothesis
-import tests.machinery.pytest
 from derivepassphrase import _types, cli
 from derivepassphrase._internals import cli_helpers
+from tests import data, machinery
+from tests.machinery import hypothesis as hypothesis_machinery
+from tests.machinery import pytest as pytest_machinery
 
 if TYPE_CHECKING:
     import multiprocessing
@@ -33,9 +31,9 @@ if TYPE_CHECKING:
     from typing_extensions import Literal
 
 # All tests in this module are heavy-duty tests.
-pytestmark = [tests.machinery.pytest.heavy_duty]
+pytestmark = [pytest_machinery.heavy_duty]
 
-KNOWN_SERVICES = (tests.data.DUMMY_SERVICE, "email", "bank", "work")
+KNOWN_SERVICES = (data.DUMMY_SERVICE, "email", "bank", "work")
 """Known service names.  Used for the [`ConfigManagementStateMachine`][]."""
 VALID_PROPERTIES = (
     "length",
@@ -71,7 +69,7 @@ def build_reduced_vault_config_settings(
 
 SERVICES_STRATEGY = strategies.builds(
     build_reduced_vault_config_settings,
-    tests.machinery.hypothesis.vault_full_service_config(),
+    hypothesis_machinery.vault_full_service_config(),
     strategies.sets(
         strategies.sampled_from(VALID_PROPERTIES),
         max_size=7,
@@ -165,13 +163,13 @@ class ConfigManagementStateMachine(stateful.RuleBasedStateMachine):
     def __init__(self) -> None:
         """Initialize self, set up context managers and enter them."""
         super().__init__()
-        self.runner = tests.machinery.CliRunner(mix_stderr=False)
+        self.runner = machinery.CliRunner(mix_stderr=False)
         self.exit_stack = contextlib.ExitStack().__enter__()
         self.monkeypatch = self.exit_stack.enter_context(
             pytest.MonkeyPatch().context()
         )
         self.isolated_config = self.exit_stack.enter_context(
-            tests.machinery.pytest.isolated_vault_config(
+            pytest_machinery.isolated_vault_config(
                 monkeypatch=self.monkeypatch,
                 runner=self.runner,
                 vault_config={"services": {}},
@@ -592,7 +590,7 @@ def run_actions_handler(
                 timeout=timeout,
             ),
         )
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         try:
             result = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -623,7 +621,7 @@ def run_actions_handler(
 
 
 @hypothesis.settings(
-    stateful_step_count=tests.machinery.hypothesis.get_concurrency_step_count(),
+    stateful_step_count=hypothesis_machinery.get_concurrency_step_count(),
     deadline=None,
 )
 class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
@@ -805,7 +803,7 @@ class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
         except AttributeError:  # pragma: no cover
             settings = None
         self.step_count = (
-            tests.machinery.hypothesis.get_concurrency_step_count(settings)
+            hypothesis_machinery.get_concurrency_step_count(settings)
         )
 
     @stateful.initialize(
@@ -1085,7 +1083,7 @@ class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
         mp = multiprocessing.get_context()
         # Coverage tracking writes coverage data to the current working
         # directory, but because the subprocesses are spawned within the
-        # `tests.machinery.pytest.isolated_vault_config` context manager, their starting
+        # `pytest_machinery.isolated_vault_config` context manager, their starting
         # working directory is the isolated one, not the original one.
         orig_cwd = pathlib.Path.cwd()
 
@@ -1104,10 +1102,10 @@ class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
 
         stack = contextlib.ExitStack()
         with stack:
-            runner = tests.machinery.CliRunner(mix_stderr=False)
+            runner = machinery.CliRunner(mix_stderr=False)
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"services": {}},
@@ -1128,10 +1126,10 @@ class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
                 )
 
         with stack:  # noqa: PLR1702
-            runner = tests.machinery.CliRunner(mix_stderr=False)
+            runner = machinery.CliRunner(mix_stderr=False)
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_config(
+                pytest_machinery.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={"services": {}},
@@ -1216,7 +1214,7 @@ class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
                             break
                 finally:
                     # The subprocesses have this
-                    # `tests.machinery.pytest.isolated_vault_config` directory as their
+                    # `pytest_machinery.isolated_vault_config` directory as their
                     # startup and working directory, so systems like
                     # coverage tracking write their data files to this
                     # directory.  We need to manually move them back to
@@ -1312,7 +1310,7 @@ class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
 
 
 TestFakedConfigurationMutex = (
-    tests.machinery.pytest.skip_if_no_multiprocessing_support(
+    pytest_machinery.skip_if_no_multiprocessing_support(
         FakeConfigurationMutexStateMachine.TestCase
     )
 )

tests/test_derivepassphrase_cli_export_vault.py

Zeige Datei @ a513587

@@ -15,11 +15,10 @@ import hypothesis
 import pytest
 from hypothesis import strategies
 
-import tests.data
-import tests.machinery
-import tests.machinery.pytest
 from derivepassphrase import _types, cli, exporter
 from derivepassphrase.exporter import storeroom, vault_native
+from tests import data, machinery
+from tests.machinery import pytest as pytest_machinery
 
 cryptography = pytest.importorskip("cryptography", minversion="38.0")
 
@@ -49,27 +48,27 @@ class Parametrize(types.SimpleNamespace):
         ["config", "format", "config_data"],
         [
             pytest.param(
-                tests.data.VAULT_V02_CONFIG,
+                data.VAULT_V02_CONFIG,
                 "v0.2",
-                tests.data.VAULT_V02_CONFIG_DATA,
+                data.VAULT_V02_CONFIG_DATA,
                 id="V02_CONFIG-v0.2",
             ),
             pytest.param(
-                tests.data.VAULT_V02_CONFIG,
+                data.VAULT_V02_CONFIG,
                 "v0.3",
                 exporter.NotAVaultConfigError,
                 id="V02_CONFIG-v0.3",
             ),
             pytest.param(
-                tests.data.VAULT_V03_CONFIG,
+                data.VAULT_V03_CONFIG,
                 "v0.2",
                 exporter.NotAVaultConfigError,
                 id="V03_CONFIG-v0.2",
             ),
             pytest.param(
-                tests.data.VAULT_V03_CONFIG,
+                data.VAULT_V03_CONFIG,
                 "v0.3",
-                tests.data.VAULT_V03_CONFIG_DATA,
+                data.VAULT_V03_CONFIG_DATA,
                 id="V03_CONFIG-v0.3",
             ),
         ],
@@ -78,39 +77,19 @@ class Parametrize(types.SimpleNamespace):
         ["config", "parser_class", "config_data"],
         [
             pytest.param(
-                tests.data.VAULT_V02_CONFIG,
+                data.VAULT_V02_CONFIG,
                 vault_native.VaultNativeV02ConfigParser,
-                tests.data.VAULT_V02_CONFIG_DATA,
+                data.VAULT_V02_CONFIG_DATA,
                 id="0.2",
             ),
             pytest.param(
-                tests.data.VAULT_V03_CONFIG,
+                data.VAULT_V03_CONFIG,
                 vault_native.VaultNativeV03ConfigParser,
-                tests.data.VAULT_V03_CONFIG_DATA,
+                data.VAULT_V03_CONFIG_DATA,
                 id="0.3",
             ),
         ],
     )
-    BAD_MASTER_KEYS_DATA = pytest.mark.parametrize(
-        ["data", "err_msg"],
-        [
-            pytest.param(
-                '{"version": 255}',
-                "bad or unsupported keys version header",
-                id="v255",
-            ),
-            pytest.param(
-                '{"version": 1}\nAAAA\nAAAA',
-                "trailing data; cannot make sense",
-                id="trailing-data",
-            ),
-            pytest.param(
-                '{"version": 1}\nAAAA',
-                "cannot handle version 0 encrypted keys",
-                id="v0-keys",
-            ),
-        ],
-    )
     STOREROOM_HANDLER = pytest.mark.parametrize(
         "handler",
         [
@@ -136,41 +115,61 @@ class Parametrize(types.SimpleNamespace):
         "key",
         [
             None,
-            pytest.param(tests.data.VAULT_MASTER_KEY, id="str"),
+            pytest.param(data.VAULT_MASTER_KEY, id="str"),
             pytest.param(
-                tests.data.VAULT_MASTER_KEY.encode("ascii"), id="bytes"
+                data.VAULT_MASTER_KEY.encode("ascii"), id="bytes"
             ),
             pytest.param(
-                bytearray(tests.data.VAULT_MASTER_KEY.encode("ascii")),
+                bytearray(data.VAULT_MASTER_KEY.encode("ascii")),
                 id="bytearray",
             ),
             pytest.param(
-                memoryview(tests.data.VAULT_MASTER_KEY.encode("ascii")),
+                memoryview(data.VAULT_MASTER_KEY.encode("ascii")),
                 id="memoryview",
             ),
         ],
     )
+    BAD_MASTER_KEYS_DATA = pytest.mark.parametrize(
+        ["master_keys_data", "err_msg"],
+        [
+            pytest.param(
+                '{"version": 255}',
+                "bad or unsupported keys version header",
+                id="v255",
+            ),
+            pytest.param(
+                '{"version": 1}\nAAAA\nAAAA',
+                "trailing data; cannot make sense",
+                id="trailing-data",
+            ),
+            pytest.param(
+                '{"version": 1}\nAAAA',
+                "cannot handle version 0 encrypted keys",
+                id="v0-keys",
+            ),
+        ],
+    )
     PATH = pytest.mark.parametrize("path", [".vault", None])
     BAD_STOREROOM_CONFIG_DATA = pytest.mark.parametrize(
         ["zipped_config", "error_text"],
         [
             pytest.param(
-                tests.data.VAULT_STOREROOM_BROKEN_DIR_CONFIG_ZIPPED,
+                data.VAULT_STOREROOM_BROKEN_DIR_CONFIG_ZIPPED,
                 "Object key mismatch",
                 id="VAULT_STOREROOM_BROKEN_DIR_CONFIG_ZIPPED",
             ),
             pytest.param(
-                tests.data.VAULT_STOREROOM_BROKEN_DIR_CONFIG_ZIPPED2,
+                data.VAULT_STOREROOM_BROKEN_DIR_CONFIG_ZIPPED2,
                 "Directory index is not actually an index",
                 id="VAULT_STOREROOM_BROKEN_DIR_CONFIG_ZIPPED2",
             ),
             pytest.param(
-                tests.data.VAULT_STOREROOM_BROKEN_DIR_CONFIG_ZIPPED3,
+                data.VAULT_STOREROOM_BROKEN_DIR_CONFIG_ZIPPED3,
                 "Directory index is not actually an index",
                 id="VAULT_STOREROOM_BROKEN_DIR_CONFIG_ZIPPED3",
             ),
             pytest.param(
-                tests.data.VAULT_STOREROOM_BROKEN_DIR_CONFIG_ZIPPED4,
+                data.VAULT_STOREROOM_BROKEN_DIR_CONFIG_ZIPPED4,
                 "Object key mismatch",
                 id="VAULT_STOREROOM_BROKEN_DIR_CONFIG_ZIPPED4",
             ),
@@ -189,51 +188,51 @@ class TestCLI:
         [`exporter.get_vault_path`][] for details.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-                    vault_config=tests.data.VAULT_V03_CONFIG,
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_config=data.VAULT_V03_CONFIG,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
-            monkeypatch.setenv("VAULT_KEY", tests.data.VAULT_MASTER_KEY)
+            monkeypatch.setenv("VAULT_KEY", data.VAULT_MASTER_KEY)
             result = runner.invoke(
                 cli.derivepassphrase_export_vault,
                 ["VAULT_PATH"],
             )
         assert result.clean_exit(empty_stderr=True), "expected clean exit"
-        assert json.loads(result.stdout) == tests.data.VAULT_V03_CONFIG_DATA
+        assert json.loads(result.stdout) == data.VAULT_V03_CONFIG_DATA
 
     def test_201_key_parameter(self) -> None:
         """The `--key` option is supported."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-                    vault_config=tests.data.VAULT_V03_CONFIG,
+                    vault_config=data.VAULT_V03_CONFIG,
                 )
             )
             result = runner.invoke(
                 cli.derivepassphrase_export_vault,
-                ["-k", tests.data.VAULT_MASTER_KEY, ".vault"],
+                ["-k", data.VAULT_MASTER_KEY, ".vault"],
             )
         assert result.clean_exit(empty_stderr=True), "expected clean exit"
-        assert json.loads(result.stdout) == tests.data.VAULT_V03_CONFIG_DATA
+        assert json.loads(result.stdout) == data.VAULT_V03_CONFIG_DATA
 
-    @tests.machinery.pytest.Parametrize.VAULT_CONFIG_FORMATS_DATA
+    @pytest_machinery.Parametrize.VAULT_CONFIG_FORMATS_DATA
     def test_210_load_vault_v02_v03_storeroom(
         self,
         config: str | bytes,
@@ -246,14 +245,14 @@ class TestCLI:
         vault` to only attempt decoding in that named format.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
@@ -265,7 +264,7 @@ class TestCLI:
                     "-f",
                     format,
                     "-k",
-                    tests.data.VAULT_MASTER_KEY,
+                    data.VAULT_MASTER_KEY,
                     "VAULT_PATH",
                 ],
             )
@@ -280,18 +279,18 @@ class TestCLI:
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Fail when trying to decode non-existant files/directories."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-                    vault_config=tests.data.VAULT_V03_CONFIG,
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_config=data.VAULT_V03_CONFIG,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
             result = runner.invoke(
@@ -305,25 +304,25 @@ class TestCLI:
             ),
             record_tuples=caplog.record_tuples,
         ), "expected error exit and known error message"
-        assert tests.data.CANNOT_LOAD_CRYPTOGRAPHY not in result.stderr
+        assert data.CANNOT_LOAD_CRYPTOGRAPHY not in result.stderr
 
     def test_302_vault_config_invalid(
         self,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Fail to parse invalid vault configurations (files)."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config="",
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
             result = runner.invoke(
@@ -334,25 +333,25 @@ class TestCLI:
             error="Cannot parse '.vault' as a valid vault-native config",
             record_tuples=caplog.record_tuples,
         ), "expected error exit and known error message"
-        assert tests.data.CANNOT_LOAD_CRYPTOGRAPHY not in result.stderr
+        assert data.CANNOT_LOAD_CRYPTOGRAPHY not in result.stderr
 
     def test_302a_vault_config_invalid_just_a_directory(
         self,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Fail to parse invalid vault configurations (directories)."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config="",
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
             p = pathlib.Path(".vault")
@@ -366,25 +365,25 @@ class TestCLI:
             error="Cannot parse '.vault' as a valid vault-native config",
             record_tuples=caplog.record_tuples,
         ), "expected error exit and known error message"
-        assert tests.data.CANNOT_LOAD_CRYPTOGRAPHY not in result.stderr
+        assert data.CANNOT_LOAD_CRYPTOGRAPHY not in result.stderr
 
     def test_403_invalid_vault_config_bad_signature(
         self,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Fail to parse vault configurations with invalid integrity checks."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-                    vault_config=tests.data.VAULT_V02_CONFIG,
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_config=data.VAULT_V02_CONFIG,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
             result = runner.invoke(
@@ -395,25 +394,25 @@ class TestCLI:
             error="Cannot parse '.vault' as a valid vault-native config",
             record_tuples=caplog.record_tuples,
         ), "expected error exit and known error message"
-        assert tests.data.CANNOT_LOAD_CRYPTOGRAPHY not in result.stderr
+        assert data.CANNOT_LOAD_CRYPTOGRAPHY not in result.stderr
 
     def test_500_vault_config_invalid_internal(
         self,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """The decoded vault configuration data is valid."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-                    vault_config=tests.data.VAULT_V03_CONFIG,
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_config=data.VAULT_V03_CONFIG,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
 
@@ -433,7 +432,7 @@ class TestCLI:
             error="Invalid vault config: ",
             record_tuples=caplog.record_tuples,
         ), "expected error exit and known error message"
-        assert tests.data.CANNOT_LOAD_CRYPTOGRAPHY not in result.stderr
+        assert data.CANNOT_LOAD_CRYPTOGRAPHY not in result.stderr
 
 
 class TestStoreroom:
@@ -454,23 +453,23 @@ class TestStoreroom:
         them as well.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-                    vault_config=tests.data.VAULT_STOREROOM_CONFIG_ZIPPED,
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_config=data.VAULT_STOREROOM_CONFIG_ZIPPED,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
             assert (
                 handler(path, key, format="storeroom")
-                == tests.data.VAULT_STOREROOM_CONFIG_DATA
+                == data.VAULT_STOREROOM_CONFIG_DATA
             )
 
     def test_400_decrypt_bucket_item_unknown_version(self) -> None:
@@ -497,7 +496,7 @@ class TestStoreroom:
         wrong shape.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         master_keys = _types.StoreroomMasterKeys(
             encryption_key=bytes(storeroom.KEY_SIZE),
             signing_key=bytes(storeroom.KEY_SIZE),
@@ -509,10 +508,10 @@ class TestStoreroom:
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-                    vault_config=tests.data.VAULT_STOREROOM_CONFIG_ZIPPED,
+                    vault_config=data.VAULT_STOREROOM_CONFIG_ZIPPED,
                 )
             )
             p = pathlib.Path(".vault", "20")
@@ -525,7 +524,7 @@ class TestStoreroom:
     @Parametrize.STOREROOM_HANDLER
     def test_402_export_storeroom_data_bad_master_keys_file(
         self,
-        data: str,
+        master_keys_data: str,
         err_msg: str,
         handler: exporter.ExportVaultConfigDataFunction,
     ) -> None:
@@ -534,23 +533,23 @@ class TestStoreroom:
         These include unknown versions, and data of the wrong shape.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-                    vault_config=tests.data.VAULT_STOREROOM_CONFIG_ZIPPED,
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_config=data.VAULT_STOREROOM_CONFIG_ZIPPED,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
             p = pathlib.Path(".vault", ".keys")
             with p.open("w", encoding="UTF-8") as outfile:
-                print(data, file=outfile)
+                print(master_keys_data, file=outfile)
             with pytest.raises(RuntimeError, match=err_msg):
                 handler(format="storeroom")
 
@@ -576,18 +575,18 @@ class TestStoreroom:
             subdirectories.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=zipped_config,
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
             stack.enter_context(pytest.raises(RuntimeError, match=error_text))
@@ -678,7 +677,7 @@ class TestVaultNativeConfig:
         """The PBKDF2 helper function works."""
         assert (
             vault_native.VaultNativeConfigParser._pbkdf2(
-                tests.data.VAULT_MASTER_KEY.encode("utf-8"), 32, iterations
+                data.VAULT_MASTER_KEY.encode("utf-8"), 32, iterations
             )
             == result
         )
@@ -702,18 +701,18 @@ class TestVaultNativeConfig:
             no longer does.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
             if isinstance(config_data, type):
@@ -738,23 +737,23 @@ class TestVaultNativeConfig:
         them as well.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-                    vault_config=tests.data.VAULT_V03_CONFIG,
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_config=data.VAULT_V03_CONFIG,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
             assert (
                 handler(path, key, format="v0.3")
-                == tests.data.VAULT_V03_CONFIG_DATA
+                == data.VAULT_V03_CONFIG_DATA
             )
 
     @Parametrize.VAULT_NATIVE_PARSER_CLASS_DATA
@@ -773,21 +772,21 @@ class TestVaultNativeConfig:
 
             return func
 
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
                 )
             )
             parser = parser_class(
-                base64.b64decode(config), tests.data.VAULT_MASTER_KEY
+                base64.b64decode(config), data.VAULT_MASTER_KEY
             )
             assert parser() == config_data
             # Now stub out all functions used to calculate the above result.

tests/test_derivepassphrase_exporter.py

Zeige Datei @ a513587

@@ -16,10 +16,9 @@ import hypothesis
 import pytest
 from hypothesis import strategies
 
-import tests.data
-import tests.machinery
-import tests.machinery.pytest
 from derivepassphrase import cli, exporter
+from tests import data, machinery
+from tests.machinery import pytest as pytest_machinery
 
 if TYPE_CHECKING:
     from typing_extensions import Buffer
@@ -207,14 +206,14 @@ class Test001ExporterUtils:
             ("USER", user),
             ("USERNAME", username),
         ]
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch, runner=runner
                 )
             )
@@ -234,14 +233,14 @@ class Test001ExporterUtils:
         Handle relative paths, absolute paths, and missing paths.
 
         """
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch, runner=runner
                 )
             )
@@ -379,18 +378,18 @@ class Test002CLI:
 
     def test_300_invalid_format(self) -> None:
         """Reject invalid vault configuration format names."""
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-                    vault_config=tests.data.VAULT_V03_CONFIG,
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_config=data.VAULT_V03_CONFIG,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
             result = runner.invoke(
@@ -403,8 +402,8 @@ class Test002CLI:
                 "expected error exit and known error message"
             )
 
-    @tests.machinery.pytest.skip_if_cryptography_support
-    @tests.machinery.pytest.Parametrize.VAULT_CONFIG_FORMATS_DATA
+    @pytest_machinery.skip_if_cryptography_support
+    @pytest_machinery.Parametrize.VAULT_CONFIG_FORMATS_DATA
     def test_999_no_cryptography_error_message(
         self,
         caplog: pytest.LogCaptureFixture,
@@ -414,18 +413,18 @@ class Test002CLI:
     ) -> None:
         """Abort export call if no cryptography is available."""
         del config_data
-        runner = tests.machinery.CliRunner(mix_stderr=False)
+        runner = machinery.CliRunner(mix_stderr=False)
         # TODO(the-13th-letter): Rewrite using parenthesized
         # with-statements.
         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
         with contextlib.ExitStack() as stack:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             stack.enter_context(
-                tests.machinery.pytest.isolated_vault_exporter_config(
+                pytest_machinery.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
-                    vault_key=tests.data.VAULT_MASTER_KEY,
+                    vault_key=data.VAULT_MASTER_KEY,
                 )
             )
             result = runner.invoke(
@@ -434,6 +433,6 @@ class Test002CLI:
                 catch_exceptions=False,
             )
         assert result.error_exit(
-            error=tests.data.CANNOT_LOAD_CRYPTOGRAPHY,
+            error=data.CANNOT_LOAD_CRYPTOGRAPHY,
             record_tuples=caplog.record_tuples,
         ), "expected error exit and known error message"

tests/test_derivepassphrase_ssh_agent/__init__.py

Zeige Datei @ a513587

@@ -25,14 +25,12 @@ import hypothesis
 import pytest
 from hypothesis import strategies
 
-import tests.data
-import tests.data.callables
-import tests.machinery
-import tests.machinery.hypothesis
-import tests.machinery.pytest
 from derivepassphrase import _types, ssh_agent, vault
 from derivepassphrase._internals import cli_helpers
 from derivepassphrase.ssh_agent import socketprovider
+from tests import data, machinery
+from tests.data import callables
+from tests.machinery import pytest as pytest_machinery
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
@@ -50,7 +48,7 @@ class Parametrize(types.SimpleNamespace):
             pytest.param(
                 [
                     importlib.metadata.EntryPoint(
-                        name=tests.data.faulty_entry_callable.key,
+                        name=data.faulty_entry_callable.key,
                         group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
                         value="tests.data: faulty_entry_callable",
                     ),
@@ -60,7 +58,7 @@ class Parametrize(types.SimpleNamespace):
             pytest.param(
                 [
                     importlib.metadata.EntryPoint(
-                        name=tests.data.faulty_entry_name_exists.key,
+                        name=data.faulty_entry_name_exists.key,
                         group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
                         value="tests.data: faulty_entry_name_exists",
                     ),
@@ -70,7 +68,7 @@ class Parametrize(types.SimpleNamespace):
             pytest.param(
                 [
                     importlib.metadata.EntryPoint(
-                        name=tests.data.faulty_entry_alias_exists.key,
+                        name=data.faulty_entry_alias_exists.key,
                         group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
                         value="tests.data: faulty_entry_alias_exists",
                     ),
@@ -85,12 +83,12 @@ class Parametrize(types.SimpleNamespace):
             pytest.param(
                 [
                     importlib.metadata.EntryPoint(
-                        name=tests.data.posix_entry.key,
+                        name=data.posix_entry.key,
                         group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
                         value="tests.data: posix_entry",
                     ),
                     importlib.metadata.EntryPoint(
-                        name=tests.data.the_annoying_os_entry.key,
+                        name=data.the_annoying_os_entry.key,
                         group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
                         value="tests.data: the_annoying_os_entry",
                     ),
@@ -100,12 +98,12 @@ class Parametrize(types.SimpleNamespace):
             pytest.param(
                 [
                     importlib.metadata.EntryPoint(
-                        name=tests.data.callables.provider_entry1.key,
+                        name=callables.provider_entry1.key,
                         group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
                         value="tests.data.callables: provider_entry1",
                     ),
                     importlib.metadata.EntryPoint(
-                        name=tests.data.callables.provider_entry2.key,
+                        name=callables.provider_entry2.key,
                         group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
                         value="tests.data.callables: provider_entry2",
                     ),
@@ -257,7 +255,7 @@ class Parametrize(types.SimpleNamespace):
                 id="key-not-loaded",
             ),
             pytest.param(
-                tests.data.SUPPORTED_KEYS["ed25519"].public_key_data,
+                data.SUPPORTED_KEYS["ed25519"].public_key_data,
                 True,
                 _types.SSH_AGENT.FAILURE,
                 b"",
@@ -271,10 +269,10 @@ class Parametrize(types.SimpleNamespace):
         ["key", "single"],
         [
             (value.public_key_data, False)
-            for value in tests.data.SUPPORTED_KEYS.values()
+            for value in data.SUPPORTED_KEYS.values()
         ]
-        + [(tests.data.callables.list_keys_singleton()[0].key, True)],
-        ids=[*tests.data.SUPPORTED_KEYS.keys(), "singleton"],
+        + [(callables.list_keys_singleton()[0].key, True)],
+        ids=[*data.SUPPORTED_KEYS.keys(), "singleton"],
     )
     SH_EXPORT_LINES = pytest.mark.parametrize(
         ["line", "env_name", "value"],
@@ -370,7 +368,7 @@ class Parametrize(types.SimpleNamespace):
                     b"".join([
                         b"\x0d",
                         ssh_agent.SSHAgentClient.string(
-                            tests.data.ALL_KEYS["rsa"].public_key_data
+                            data.ALL_KEYS["rsa"].public_key_data
                         ),
                         ssh_agent.SSHAgentClient.string(vault.Vault.UUID),
                         b"\x00\x00\x00\x02",
@@ -383,7 +381,7 @@ class Parametrize(types.SimpleNamespace):
                     b"".join([
                         b"\x0d",
                         ssh_agent.SSHAgentClient.string(
-                            tests.data.ALL_KEYS["ed25519"].public_key_data
+                            data.ALL_KEYS["ed25519"].public_key_data
                         ),
                         b"\x00\x00\x00\x08\x00\x01\x02\x03\x04\x05\x06\x07",
                         b"\x00\x00\x00\x00",
@@ -396,7 +394,7 @@ class Parametrize(types.SimpleNamespace):
                     b"".join([
                         b"\x0d",
                         ssh_agent.SSHAgentClient.string(
-                            tests.data.ALL_KEYS["dsa1024"].public_key_data
+                            data.ALL_KEYS["dsa1024"].public_key_data
                         ),
                         ssh_agent.SSHAgentClient.string(vault.Vault.UUID),
                         b"\x00\x00\x00\x00",
@@ -419,8 +417,8 @@ class Parametrize(types.SimpleNamespace):
     )
     PUBLIC_KEY_DATA = pytest.mark.parametrize(
         "public_key_struct",
-        list(tests.data.SUPPORTED_KEYS.values()),
-        ids=list(tests.data.SUPPORTED_KEYS.keys()),
+        list(data.SUPPORTED_KEYS.values()),
+        ids=list(data.SUPPORTED_KEYS.keys()),
     )
     REQUEST_ERROR_RESPONSES = pytest.mark.parametrize(
         ["request_code", "response_code", "exc_type", "exc_pattern"],
@@ -488,13 +486,13 @@ class Parametrize(types.SimpleNamespace):
     )
     SUPPORTED_SSH_TEST_KEYS = pytest.mark.parametrize(
         ["ssh_test_key_type", "ssh_test_key"],
-        list(tests.data.SUPPORTED_KEYS.items()),
-        ids=tests.data.SUPPORTED_KEYS.keys(),
+        list(data.SUPPORTED_KEYS.items()),
+        ids=data.SUPPORTED_KEYS.keys(),
     )
     UNSUITABLE_SSH_TEST_KEYS = pytest.mark.parametrize(
         ["ssh_test_key_type", "ssh_test_key"],
-        list(tests.data.UNSUITABLE_KEYS.items()),
-        ids=tests.data.UNSUITABLE_KEYS.keys(),
+        list(data.UNSUITABLE_KEYS.items()),
+        ids=data.UNSUITABLE_KEYS.keys(),
     )
     RESOLVE_CHAINS = pytest.mark.parametrize(
         ["terminal", "chain"],
@@ -518,10 +516,10 @@ class TestTestingMachineryStubbedSSHAgentSocket:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             monkeypatch.setenv(
                 "SSH_AUTH_SOCK",
-                tests.machinery.StubbedSSHAgentSocketWithAddress.ADDRESS,
+                machinery.StubbedSSHAgentSocketWithAddress.ADDRESS,
             )
             agent = stack.enter_context(
-                tests.machinery.StubbedSSHAgentSocketWithAddress()
+                machinery.StubbedSSHAgentSocketWithAddress()
             )
             assert "query" not in agent.enabled_extensions
             query_request = (
@@ -547,10 +545,10 @@ class TestTestingMachineryStubbedSSHAgentSocket:
             monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
             monkeypatch.setenv(
                 "SSH_AUTH_SOCK",
-                tests.machinery.StubbedSSHAgentSocketWithAddress.ADDRESS,
+                machinery.StubbedSSHAgentSocketWithAddress.ADDRESS,
             )
             agent = stack.enter_context(
-                tests.machinery.StubbedSSHAgentSocketWithAddressAndDeterministicDSA()
+                machinery.StubbedSSHAgentSocketWithAddressAndDeterministicDSA()
             )
             assert "query" in agent.enabled_extensions
             query_request = (
@@ -580,7 +578,7 @@ class TestTestingMachineryStubbedSSHAgentSocket:
     def test_101_request_identities(self) -> None:
         """The agent implements a known list of identities."""
         unstring_prefix = ssh_agent.SSHAgentClient.unstring_prefix
-        with tests.machinery.StubbedSSHAgentSocket() as agent:
+        with machinery.StubbedSSHAgentSocket() as agent:
             query_request = (
                 # SSH string header
                 b"\x00\x00\x00\x01"
@@ -603,7 +601,7 @@ class TestTestingMachineryStubbedSSHAgentSocket:
                 _comment, message = unstring_prefix(message)
                 assert key
                 assert key in {
-                    k.public_key_data for k in tests.data.ALL_KEYS.values()
+                    k.public_key_data for k in data.ALL_KEYS.values()
                 }
             assert not message
 
@@ -611,11 +609,11 @@ class TestTestingMachineryStubbedSSHAgentSocket:
     def test_102_sign(
         self,
         ssh_test_key_type: str,
-        ssh_test_key: tests.data.SSHTestKey,
+        ssh_test_key: data.SSHTestKey,
     ) -> None:
         """The agent signs known key/message pairs."""
         del ssh_test_key_type
-        spec = tests.data.SSHTestKeyDeterministicSignatureClass.SPEC
+        spec = data.SSHTestKeyDeterministicSignatureClass.SPEC
         assert ssh_test_key.expected_signatures[spec].signature is not None
         string = ssh_agent.SSHAgentClient.string
         query_request = string(
@@ -634,21 +632,21 @@ class TestTestingMachineryStubbedSSHAgentSocket:
             # expected payload: the binary signature as recorded in the test key data structure
             + string(ssh_test_key.expected_signatures[spec].signature)
         )
-        with tests.machinery.StubbedSSHAgentSocket() as agent:
+        with machinery.StubbedSSHAgentSocket() as agent:
             agent.sendall(query_request)
             assert agent.recv(1000) == query_response
 
     def test_120_close_multiple(self) -> None:
         """The agent can be closed repeatedly."""
-        with tests.machinery.StubbedSSHAgentSocket() as agent:
+        with machinery.StubbedSSHAgentSocket() as agent:
             pass
-        with tests.machinery.StubbedSSHAgentSocket() as agent:
+        with machinery.StubbedSSHAgentSocket() as agent:
             pass
         del agent
 
     def test_121_closed_agents_cannot_be_interacted_with(self) -> None:
         """The agent can be closed repeatedly."""
-        with tests.machinery.StubbedSSHAgentSocket() as agent:
+        with machinery.StubbedSSHAgentSocket() as agent:
             pass
         query_request = (
             # SSH string header
@@ -662,7 +660,7 @@ class TestTestingMachineryStubbedSSHAgentSocket:
         with pytest.raises(
             ValueError,
             match=re.escape(
-                tests.machinery.StubbedSSHAgentSocket._SOCKET_IS_CLOSED
+                machinery.StubbedSSHAgentSocket._SOCKET_IS_CLOSED
             ),
         ):
             agent.sendall(query_request)
@@ -670,11 +668,11 @@ class TestTestingMachineryStubbedSSHAgentSocket:
 
     def test_122_no_recv_without_sendall(self) -> None:
         """The agent requires a message before sending a response."""
-        with tests.machinery.StubbedSSHAgentSocket() as agent:  # noqa: SIM117
+        with machinery.StubbedSSHAgentSocket() as agent:  # noqa: SIM117
             with pytest.raises(
                 AssertionError,
                 match=re.escape(
-                    tests.machinery.StubbedSSHAgentSocket._PROTOCOL_VIOLATION
+                    machinery.StubbedSSHAgentSocket._PROTOCOL_VIOLATION
                 ),
             ):
                 agent.recv(100)
@@ -691,7 +689,7 @@ class TestTestingMachineryStubbedSSHAgentSocket:
             # response code: SSH_AGENT_FAILURE
             b"\x05"
         )
-        with tests.machinery.StubbedSSHAgentSocket() as agent:
+        with machinery.StubbedSSHAgentSocket() as agent:
             agent.sendall(message)
             assert agent.recv(100) == query_response
 
@@ -707,7 +705,7 @@ class TestTestingMachineryStubbedSSHAgentSocket:
             # response code: SSH_AGENT_FAILURE
             b"\x05"
         )
-        with tests.machinery.StubbedSSHAgentSocket() as agent:
+        with machinery.StubbedSSHAgentSocket() as agent:
             agent.sendall(message)
             assert agent.recv(100) == query_response
 
@@ -729,7 +727,7 @@ class TestTestingMachineryStubbedSSHAgentSocket:
                 stack.enter_context(
                     pytest.raises(exception, match=re.escape(match))
                 )
-            tests.machinery.StubbedSSHAgentSocketWithAddress()
+            machinery.StubbedSSHAgentSocketWithAddress()
 
 
 class TestStaticFunctionality:
@@ -785,7 +783,7 @@ class TestStaticFunctionality:
     @Parametrize.PUBLIC_KEY_DATA
     def test_100_key_decoding(
         self,
-        public_key_struct: tests.data.SSHTestKey,
+        public_key_struct: data.SSHTestKey,
     ) -> None:
         """The [`tests.ALL_KEYS`][] public key data looks sane."""
         keydata = base64.b64decode(
@@ -802,14 +800,14 @@ class TestStaticFunctionality:
         """[`tests.parse_sh_export_line`][] works."""
         if value is not None:
             assert (
-                tests.data.callables.parse_sh_export_line(
+                callables.parse_sh_export_line(
                     line, env_name=env_name
                 )
                 == value
             )
         else:
             with pytest.raises(ValueError, match="Cannot parse sh line:"):
-                tests.data.callables.parse_sh_export_line(
+                callables.parse_sh_export_line(
                     line, env_name=env_name
                 )
 
@@ -1056,14 +1054,14 @@ class TestStaticFunctionality:
         """Finding all SSH agent socket providers works."""
         resolve = socketprovider.SocketProvider.resolve
         old_registry = socketprovider.SocketProvider.registry
-        with tests.machinery.pytest.faked_entry_point_list(
+        with pytest_machinery.faked_entry_point_list(
             additional_entry_points, remove_conflicting_entries=False
         ) as names:
             socketprovider.SocketProvider._find_all_ssh_agent_socket_providers()
             for name in names:
                 assert name in socketprovider.SocketProvider.registry
                 assert resolve(name) in {
-                    tests.data.callables.provider_entry_provider,
+                    callables.provider_entry_provider,
                     *old_registry.values(),
                 }
 
@@ -1075,7 +1073,7 @@ class TestStaticFunctionality:
         """Finding faulty SSH agent socket providers raises errors."""
         with contextlib.ExitStack() as stack:
             stack.enter_context(
-                tests.machinery.pytest.faked_entry_point_list(
+                pytest_machinery.faked_entry_point_list(
                     additional_entry_points, remove_conflicting_entries=False
                 )
             )
@@ -1246,7 +1244,7 @@ class TestAgentInteraction:
         self,
         ssh_agent_client_with_test_keys_loaded: ssh_agent.SSHAgentClient,
         ssh_test_key_type: str,
-        ssh_test_key: tests.data.SSHTestKey,
+        ssh_test_key: data.SSHTestKey,
     ) -> None:
         """Signing data with specific SSH keys works.
 
@@ -1259,11 +1257,11 @@ class TestAgentInteraction:
         key_comment_pairs = {bytes(k): bytes(c) for k, c in client.list_keys()}
         public_key_data = ssh_test_key.public_key_data
         assert (
-            tests.data.SSHTestKeyDeterministicSignatureClass.SPEC
+            data.SSHTestKeyDeterministicSignatureClass.SPEC
             in ssh_test_key.expected_signatures
         )
         sig = ssh_test_key.expected_signatures[
-            tests.data.SSHTestKeyDeterministicSignatureClass.SPEC
+            data.SSHTestKeyDeterministicSignatureClass.SPEC
         ]
         expected_signature = sig.signature
         derived_passphrase = sig.derived_passphrase
@@ -1291,7 +1289,7 @@ class TestAgentInteraction:
         self,
         ssh_agent_client_with_test_keys_loaded: ssh_agent.SSHAgentClient,
         ssh_test_key_type: str,
-        ssh_test_key: tests.data.SSHTestKey,
+        ssh_test_key: data.SSHTestKey,
     ) -> None:
         """Using an unsuitable key with [`vault.Vault`][] fails.
 
@@ -1336,11 +1334,11 @@ class TestAgentInteraction:
         def key_is_suitable(key: bytes) -> bool:
             """Stub out [`vault.Vault.key_is_suitable`][]."""
             always = {
-                v.public_key_data for v in tests.data.SUPPORTED_KEYS.values()
+                v.public_key_data for v in data.SUPPORTED_KEYS.values()
             }
             dsa = {
                 v.public_key_data
-                for k, v in tests.data.UNSUITABLE_KEYS.items()
+                for k, v in data.UNSUITABLE_KEYS.items()
                 if k.startswith(("dsa", "ecdsa"))
             }
             return key in always or (
@@ -1356,11 +1354,11 @@ class TestAgentInteraction:
             monkeypatch.setattr(
                 ssh_agent.SSHAgentClient,
                 "list_keys",
-                tests.data.callables.list_keys_singleton,
+                callables.list_keys_singleton,
             )
             keys = [
                 pair.key
-                for pair in tests.data.callables.list_keys_singleton()
+                for pair in callables.list_keys_singleton()
                 if key_is_suitable(pair.key)
             ]
             index = "1"
@@ -1369,11 +1367,11 @@ class TestAgentInteraction:
             monkeypatch.setattr(
                 ssh_agent.SSHAgentClient,
                 "list_keys",
-                tests.data.callables.list_keys,
+                callables.list_keys,
             )
             keys = [
                 pair.key
-                for pair in tests.data.callables.list_keys()
+                for pair in callables.list_keys()
                 if key_is_suitable(pair.key)
             ]
             index = str(1 + keys.index(key))
@@ -1389,7 +1387,7 @@ class TestAgentInteraction:
 
         # TODO(the-13th-letter): (Continued from above.)  Update input
         # data to use `index`/`input` directly and unconditionally.
-        runner = tests.machinery.CliRunner(mix_stderr=True)
+        runner = machinery.CliRunner(mix_stderr=True)
         result = runner.invoke(
             driver,
             [],
@@ -1401,7 +1399,7 @@ class TestAgentInteraction:
 
     def test_300_constructor_bad_running_agent(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
     ) -> None:
         """Fail if the agent address is invalid."""
         with pytest.MonkeyPatch.context() as monkeypatch:
@@ -1445,7 +1443,7 @@ class TestAgentInteraction:
 
     def test_303_explicit_socket(
         self,
-        spawn_ssh_agent: tests.data.SpawnedSSHAgentInfo,
+        spawn_ssh_agent: data.SpawnedSSHAgentInfo,
     ) -> None:
         conn = spawn_ssh_agent.client._connection
         ssh_agent.SSHAgentClient(socket=conn)
@@ -1453,7 +1451,7 @@ class TestAgentInteraction:
     @Parametrize.TRUNCATED_AGENT_RESPONSES
     def test_310_truncated_server_response(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
         response: bytes,
     ) -> None:
         """Fail on truncated responses from the SSH agent."""
@@ -1477,7 +1475,7 @@ class TestAgentInteraction:
     @Parametrize.LIST_KEYS_ERROR_RESPONSES
     def test_320_list_keys_error_responses(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
         response_code: _types.SSH_AGENT,
         response: bytes | bytearray,
         exc_type: type[Exception],
@@ -1537,7 +1535,7 @@ class TestAgentInteraction:
     @Parametrize.SIGN_ERROR_RESPONSES
     def test_330_sign_error_responses(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
         key: bytes | bytearray,
         check: bool,
         response_code: _types.SSH_AGENT,
@@ -1597,7 +1595,7 @@ class TestAgentInteraction:
             com = b"no comment"
             loaded_keys = [
                 Pair(v.public_key_data, com).toreadonly()
-                for v in tests.data.SUPPORTED_KEYS.values()
+                for v in data.SUPPORTED_KEYS.values()
             ]
             monkeypatch.setattr(client, "list_keys", lambda: loaded_keys)
             with pytest.raises(exc_type, match=exc_pattern):
@@ -1606,7 +1604,7 @@ class TestAgentInteraction:
     @Parametrize.REQUEST_ERROR_RESPONSES
     def test_340_request_error_responses(
         self,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
         request_code: _types.SSH_AGENTC,
         response_code: _types.SSH_AGENT,
         exc_type: type[Exception],
@@ -1635,7 +1633,7 @@ class TestAgentInteraction:
     def test_350_query_extensions_malformed_responses(
         self,
         monkeypatch: pytest.MonkeyPatch,
-        running_ssh_agent: tests.data.RunningSSHAgentInfo,
+        running_ssh_agent: data.RunningSSHAgentInfo,
         response_data: bytes,
     ) -> None:
         """Fail on malformed responses while querying extensions."""

tests/test_derivepassphrase_ssh_agent/test_heavy_duty.py

Zeige Datei @ a513587

@@ -12,14 +12,14 @@ from typing import TYPE_CHECKING
 import pytest
 from hypothesis import stateful, strategies
 
-import tests.machinery.pytest
 from derivepassphrase.ssh_agent import socketprovider
+from tests.machinery import pytest as pytest_machinery
 
 if TYPE_CHECKING:
     from derivepassphrase import _types
 
 # All tests in this module are heavy-duty tests.
-pytestmark = [tests.machinery.pytest.heavy_duty]
+pytestmark = [pytest_machinery.heavy_duty]
 
 
 @strategies.composite

tests/test_derivepassphrase_types/__init__.py

Zeige Datei @ a513587

@@ -11,10 +11,9 @@ import hypothesis
 import pytest
 from hypothesis import strategies
 
-import tests.data
-import tests.data.callables
-import tests.machinery.hypothesis
 from derivepassphrase import _types
+from tests import data
+from tests.machinery import hypothesis as hypothesis_machinery
 
 
 class Parametrize(types.SimpleNamespace):
@@ -22,20 +21,20 @@ class Parametrize(types.SimpleNamespace):
         "test_config",
         [
             conf
-            for conf in tests.data.TEST_CONFIGS
+            for conf in data.TEST_CONFIGS
             if conf.validation_settings in {None, (True,)}
         ],
-        ids=tests.data.VaultTestConfig._test_id,
+        ids=data.VaultTestConfig._test_id,
     )
     VAULT_TEST_CONFIGS = pytest.mark.parametrize(
         "test_config",
-        tests.data.TEST_CONFIGS,
-        ids=tests.data.VaultTestConfig._test_id,
+        data.TEST_CONFIGS,
+        ids=data.VaultTestConfig._test_id,
     )
 
 
 @Parametrize.VALID_VAULT_TEST_CONFIGS
-def test_200_is_vault_config(test_config: tests.data.VaultTestConfig) -> None:
+def test_200_is_vault_config(test_config: data.VaultTestConfig) -> None:
     """Is this vault configuration recognized as valid/invalid?
 
     Check all test configurations that do not need custom validation
@@ -56,14 +55,14 @@ def test_200_is_vault_config(test_config: tests.data.VaultTestConfig) -> None:
 
 
 @hypothesis.given(
-    test_config=tests.machinery.hypothesis.smudged_vault_test_config(
+    test_config=hypothesis_machinery.smudged_vault_test_config(
         config=strategies.sampled_from([
-            conf for conf in tests.data.TEST_CONFIGS if conf.is_valid()
+            conf for conf in data.TEST_CONFIGS if conf.is_valid()
         ])
     )
 )
 def test_200a_is_vault_config_smudged(
-    test_config: tests.data.VaultTestConfig,
+    test_config: data.VaultTestConfig,
 ) -> None:
     """Is this vault configuration recognized as valid/invalid?
 
@@ -89,7 +88,7 @@ def test_200a_is_vault_config_smudged(
 
 @Parametrize.VAULT_TEST_CONFIGS
 def test_400_validate_vault_config(
-    test_config: tests.data.VaultTestConfig,
+    test_config: data.VaultTestConfig,
 ) -> None:
     """Validate this vault configuration.
 
@@ -121,14 +120,14 @@ def test_400_validate_vault_config(
 
 
 @hypothesis.given(
-    test_config=tests.machinery.hypothesis.smudged_vault_test_config(
+    test_config=hypothesis_machinery.smudged_vault_test_config(
         config=strategies.sampled_from([
-            conf for conf in tests.data.TEST_CONFIGS if conf.is_smudgable()
+            conf for conf in data.TEST_CONFIGS if conf.is_smudgable()
         ])
     )
 )
 def test_400a_validate_vault_config_smudged(
-    test_config: tests.data.VaultTestConfig,
+    test_config: data.VaultTestConfig,
 ) -> None:
     """Validate this vault configuration.
 

tests/test_derivepassphrase_types/test_heavy_duty.py

Zeige Datei @ a513587

@@ -10,11 +10,11 @@ import hypothesis
 from hypothesis import strategies
 from typing_extensions import Any
 
-import tests.machinery.pytest
 from derivepassphrase import _types
+from tests.machinery import pytest as pytest_machinery
 
 # All tests in this module are heavy-duty tests.
-pytestmark = [tests.machinery.pytest.heavy_duty]
+pytestmark = [pytest_machinery.heavy_duty]
 
 
 @strategies.composite

tests/test_derivepassphrase_vault.py

Zeige Datei @ a513587

@@ -17,8 +17,8 @@ import pytest
 from hypothesis import strategies
 from typing_extensions import TypeVar
 
-import tests.machinery.hypothesis
 from derivepassphrase import vault
+from tests.machinery import hypothesis as hypothesis_machinery
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterator
@@ -503,7 +503,7 @@ class TestVault:
             min_size=1,
             max_size=32,
         ),
-        config=tests.machinery.hypothesis.vault_full_service_config(),
+        config=hypothesis_machinery.vault_full_service_config(),
         services=strategies.lists(
             strategies.binary(min_size=1, max_size=32),
             min_size=2,
@@ -629,7 +629,7 @@ class TestVault:
         phrase=strategies.one_of(
             strategies.binary(min_size=1), strategies.text(min_size=1)
         ),
-        config=tests.machinery.hypothesis.vault_full_service_config(),
+        config=hypothesis_machinery.vault_full_service_config(),
         service=strategies.text(min_size=1),
     )
     @hypothesis.example(


...	...	@@ -8,8 +8,8 @@ import base64
8	8
9	9	import pytest
10	10
11		-import tests.data
12	11	from derivepassphrase import ssh_agent
	12	+from tests import data
13	13
14	14	OPENSSH_MAGIC = b"openssh-key-v1\x00"
15	15	OPENSSH_HEADER = (
...	...	@@ -139,15 +139,15 @@ class Parametrize:
139	139
140	140	TEST_KEYS = pytest.mark.parametrize(
141	141	["keyname", "key"],
142		- tests.data.ALL_KEYS.items(),
143		- ids=tests.data.ALL_KEYS.keys(),
	142	+ data.ALL_KEYS.items(),
	143	+ ids=data.ALL_KEYS.keys(),
144	144	)
145	145
146	146
147	147	@Parametrize.TEST_KEYS
148	148	def test_100_test_keys_public_keys_are_internally_consistent(
149	149	keyname: str,
150		- key: tests.data.SSHTestKey,
	150	+ key: data.SSHTestKey,
151	151	) -> None:
152	152	"""The test key public key data structures are internally consistent."""
153	153	del keyname
...	...	@@ -163,7 +163,7 @@ def test_100_test_keys_public_keys_are_internally_consistent(
163	163	@Parametrize.TEST_KEYS
164	164	def test_101_test_keys_private_keys_are_consistent_with_public_keys(
165	165	keyname: str,
166		- key: tests.data.SSHTestKey,
	166	+ key: data.SSHTestKey,
167	167	) -> None:
168	168	"""The test key private key data are consistent with their public parts."""
169	169	del keyname
...	...	@@ -197,7 +197,7 @@ def test_101_test_keys_private_keys_are_consistent_with_public_keys(
197	197	@Parametrize.TEST_KEYS
198	198	def test_102_test_keys_private_keys_are_internally_consistent(
199	199	keyname: str,
200		- key: tests.data.SSHTestKey,
	200	+ key: data.SSHTestKey,
201	201	) -> None:
202	202	"""The test key private key data structures are internally consistent."""
203	203	del keyname

...	...	@@ -18,13 +18,11 @@ import pytest
18	18	from hypothesis import stateful, strategies
19	19	from typing_extensions import Any, NamedTuple, TypeAlias
20	20
21		-import tests.data
22		-import tests.data.callables
23		-import tests.machinery
24		-import tests.machinery.hypothesis
25		-import tests.machinery.pytest
26	21	from derivepassphrase import _types, cli
27	22	from derivepassphrase._internals import cli_helpers
	23	+from tests import data, machinery
	24	+from tests.machinery import hypothesis as hypothesis_machinery
	25	+from tests.machinery import pytest as pytest_machinery
28	26
29	27	if TYPE_CHECKING:
30	28	import multiprocessing
...	...	@@ -33,9 +31,9 @@ if TYPE_CHECKING:
33	31	from typing_extensions import Literal
34	32
35	33	# All tests in this module are heavy-duty tests.
36		-pytestmark = [tests.machinery.pytest.heavy_duty]
	34	+pytestmark = [pytest_machinery.heavy_duty]
37	35
38		-KNOWN_SERVICES = (tests.data.DUMMY_SERVICE, "email", "bank", "work")
	36	+KNOWN_SERVICES = (data.DUMMY_SERVICE, "email", "bank", "work")
39	37	"""Known service names. Used for the [`ConfigManagementStateMachine`][]."""
40	38	VALID_PROPERTIES = (
41	39	"length",
...	...	@@ -71,7 +69,7 @@ def build_reduced_vault_config_settings(
71	69
72	70	SERVICES_STRATEGY = strategies.builds(
73	71	build_reduced_vault_config_settings,
74		- tests.machinery.hypothesis.vault_full_service_config(),
	72	+ hypothesis_machinery.vault_full_service_config(),
75	73	strategies.sets(
76	74	strategies.sampled_from(VALID_PROPERTIES),
77	75	max_size=7,
...	...	@@ -165,13 +163,13 @@ class ConfigManagementStateMachine(stateful.RuleBasedStateMachine):
165	163	def __init__(self) -> None:
166	164	"""Initialize self, set up context managers and enter them."""
167	165	super().__init__()
168		- self.runner = tests.machinery.CliRunner(mix_stderr=False)
	166	+ self.runner = machinery.CliRunner(mix_stderr=False)
169	167	self.exit_stack = contextlib.ExitStack().__enter__()
170	168	self.monkeypatch = self.exit_stack.enter_context(
171	169	pytest.MonkeyPatch().context()
172	170	)
173	171	self.isolated_config = self.exit_stack.enter_context(
174		- tests.machinery.pytest.isolated_vault_config(
	172	+ pytest_machinery.isolated_vault_config(
175	173	monkeypatch=self.monkeypatch,
176	174	runner=self.runner,
177	175	vault_config={"services": {}},
...	...	@@ -592,7 +590,7 @@ def run_actions_handler(
592	590	timeout=timeout,
593	591	),
594	592	)
595		- runner = tests.machinery.CliRunner(mix_stderr=False)
	593	+ runner = machinery.CliRunner(mix_stderr=False)
596	594	try:
597	595	result = runner.invoke(
598	596	cli.derivepassphrase_vault,
...	...	@@ -623,7 +621,7 @@ def run_actions_handler(
623	621
624	622
625	623	@hypothesis.settings(
626		- stateful_step_count=tests.machinery.hypothesis.get_concurrency_step_count(),
	624	+ stateful_step_count=hypothesis_machinery.get_concurrency_step_count(),
627	625	deadline=None,
628	626	)
629	627	class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
...	...	@@ -805,7 +803,7 @@ class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
805	803	except AttributeError: # pragma: no cover
806	804	settings = None
807	805	self.step_count = (
808		- tests.machinery.hypothesis.get_concurrency_step_count(settings)
	806	+ hypothesis_machinery.get_concurrency_step_count(settings)
809	807	)
810	808
811	809	@stateful.initialize(
...	...	@@ -1085,7 +1083,7 @@ class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
1085	1083	mp = multiprocessing.get_context()
1086	1084	# Coverage tracking writes coverage data to the current working
1087	1085	# directory, but because the subprocesses are spawned within the
1088		- # `tests.machinery.pytest.isolated_vault_config` context manager, their starting
	1086	+ # `pytest_machinery.isolated_vault_config` context manager, their starting
1089	1087	# working directory is the isolated one, not the original one.
1090	1088	orig_cwd = pathlib.Path.cwd()
1091	1089
...	...	@@ -1104,10 +1102,10 @@ class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
1104	1102
1105	1103	stack = contextlib.ExitStack()
1106	1104	with stack:
1107		- runner = tests.machinery.CliRunner(mix_stderr=False)
	1105	+ runner = machinery.CliRunner(mix_stderr=False)
1108	1106	monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
1109	1107	stack.enter_context(
1110		- tests.machinery.pytest.isolated_vault_config(
	1108	+ pytest_machinery.isolated_vault_config(
1111	1109	monkeypatch=monkeypatch,
1112	1110	runner=runner,
1113	1111	vault_config={"services": {}},
...	...	@@ -1128,10 +1126,10 @@ class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
1128	1126	)
1129	1127
1130	1128	with stack: # noqa: PLR1702
1131		- runner = tests.machinery.CliRunner(mix_stderr=False)
	1129	+ runner = machinery.CliRunner(mix_stderr=False)
1132	1130	monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
1133	1131	stack.enter_context(
1134		- tests.machinery.pytest.isolated_vault_config(
	1132	+ pytest_machinery.isolated_vault_config(
1135	1133	monkeypatch=monkeypatch,
1136	1134	runner=runner,
1137	1135	vault_config={"services": {}},
...	...	@@ -1216,7 +1214,7 @@ class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
1216	1214	break
1217	1215	finally:
1218	1216	# The subprocesses have this
1219		- # `tests.machinery.pytest.isolated_vault_config` directory as their
	1217	+ # `pytest_machinery.isolated_vault_config` directory as their
1220	1218	# startup and working directory, so systems like
1221	1219	# coverage tracking write their data files to this
1222	1220	# directory. We need to manually move them back to
...	...	@@ -1312,7 +1310,7 @@ class FakeConfigurationMutexStateMachine(stateful.RuleBasedStateMachine):
1312	1310
1313	1311
1314	1312	TestFakedConfigurationMutex = (
1315		- tests.machinery.pytest.skip_if_no_multiprocessing_support(
	1313	+ pytest_machinery.skip_if_no_multiprocessing_support(
1316	1314	FakeConfigurationMutexStateMachine.TestCase
1317	1315	)
1318	1316	)

...	...	@@ -16,10 +16,9 @@ import hypothesis
16	16	import pytest
17	17	from hypothesis import strategies
18	18
19		-import tests.data
20		-import tests.machinery
21		-import tests.machinery.pytest
22	19	from derivepassphrase import cli, exporter
	20	+from tests import data, machinery
	21	+from tests.machinery import pytest as pytest_machinery
23	22
24	23	if TYPE_CHECKING:
25	24	from typing_extensions import Buffer
...	...	@@ -207,14 +206,14 @@ class Test001ExporterUtils:
207	206	("USER", user),
208	207	("USERNAME", username),
209	208	]
210		- runner = tests.machinery.CliRunner(mix_stderr=False)
	209	+ runner = machinery.CliRunner(mix_stderr=False)
211	210	# TODO(the-13th-letter): Rewrite using parenthesized
212	211	# with-statements.
213	212	# https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
214	213	with contextlib.ExitStack() as stack:
215	214	monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
216	215	stack.enter_context(
217		- tests.machinery.pytest.isolated_vault_exporter_config(
	216	+ pytest_machinery.isolated_vault_exporter_config(
218	217	monkeypatch=monkeypatch, runner=runner
219	218	)
220	219	)
...	...	@@ -234,14 +233,14 @@ class Test001ExporterUtils:
234	233	Handle relative paths, absolute paths, and missing paths.
235	234
236	235	"""
237		- runner = tests.machinery.CliRunner(mix_stderr=False)
	236	+ runner = machinery.CliRunner(mix_stderr=False)
238	237	# TODO(the-13th-letter): Rewrite using parenthesized
239	238	# with-statements.
240	239	# https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
241	240	with contextlib.ExitStack() as stack:
242	241	monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
243	242	stack.enter_context(
244		- tests.machinery.pytest.isolated_vault_exporter_config(
	243	+ pytest_machinery.isolated_vault_exporter_config(
245	244	monkeypatch=monkeypatch, runner=runner
246	245	)
247	246	)
...	...	@@ -379,18 +378,18 @@ class Test002CLI:
379	378
380	379	def test_300_invalid_format(self) -> None:
381	380	"""Reject invalid vault configuration format names."""
382		- runner = tests.machinery.CliRunner(mix_stderr=False)
	381	+ runner = machinery.CliRunner(mix_stderr=False)
383	382	# TODO(the-13th-letter): Rewrite using parenthesized
384	383	# with-statements.
385	384	# https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
386	385	with contextlib.ExitStack() as stack:
387	386	monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
388	387	stack.enter_context(
389		- tests.machinery.pytest.isolated_vault_exporter_config(
	388	+ pytest_machinery.isolated_vault_exporter_config(
390	389	monkeypatch=monkeypatch,
391	390	runner=runner,
392		- vault_config=tests.data.VAULT_V03_CONFIG,
393		- vault_key=tests.data.VAULT_MASTER_KEY,
	391	+ vault_config=data.VAULT_V03_CONFIG,
	392	+ vault_key=data.VAULT_MASTER_KEY,
394	393	)
395	394	)
396	395	result = runner.invoke(
...	...	@@ -403,8 +402,8 @@ class Test002CLI:
403	402	"expected error exit and known error message"
404	403	)
405	404
406		- @tests.machinery.pytest.skip_if_cryptography_support
407		- @tests.machinery.pytest.Parametrize.VAULT_CONFIG_FORMATS_DATA
	405	+ @pytest_machinery.skip_if_cryptography_support
	406	+ @pytest_machinery.Parametrize.VAULT_CONFIG_FORMATS_DATA
408	407	def test_999_no_cryptography_error_message(
409	408	self,
410	409	caplog: pytest.LogCaptureFixture,
...	...	@@ -414,18 +413,18 @@ class Test002CLI:
414	413	) -> None:
415	414	"""Abort export call if no cryptography is available."""
416	415	del config_data
417		- runner = tests.machinery.CliRunner(mix_stderr=False)
	416	+ runner = machinery.CliRunner(mix_stderr=False)
418	417	# TODO(the-13th-letter): Rewrite using parenthesized
419	418	# with-statements.
420	419	# https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
421	420	with contextlib.ExitStack() as stack:
422	421	monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
423	422	stack.enter_context(
424		- tests.machinery.pytest.isolated_vault_exporter_config(
	423	+ pytest_machinery.isolated_vault_exporter_config(
425	424	monkeypatch=monkeypatch,
426	425	runner=runner,
427	426	vault_config=config,
428		- vault_key=tests.data.VAULT_MASTER_KEY,
	427	+ vault_key=data.VAULT_MASTER_KEY,
429	428	)
430	429	)
431	430	result = runner.invoke(
...	...	@@ -434,6 +433,6 @@ class Test002CLI:
434	433	catch_exceptions=False,
435	434	)
436	435	assert result.error_exit(
437		- error=tests.data.CANNOT_LOAD_CRYPTOGRAPHY,
	436	+ error=data.CANNOT_LOAD_CRYPTOGRAPHY,
438	437	record_tuples=caplog.record_tuples,
439	438	), "expected error exit and known error message"

...	...	@@ -25,14 +25,12 @@ import hypothesis
25	25	import pytest
26	26	from hypothesis import strategies
27	27
28		-import tests.data
29		-import tests.data.callables
30		-import tests.machinery
31		-import tests.machinery.hypothesis
32		-import tests.machinery.pytest
33	28	from derivepassphrase import _types, ssh_agent, vault
34	29	from derivepassphrase._internals import cli_helpers
35	30	from derivepassphrase.ssh_agent import socketprovider
	31	+from tests import data, machinery
	32	+from tests.data import callables
	33	+from tests.machinery import pytest as pytest_machinery
36	34
37	35	if TYPE_CHECKING:
38	36	from collections.abc import Iterable
...	...	@@ -50,7 +48,7 @@ class Parametrize(types.SimpleNamespace):
50	48	pytest.param(
51	49	[
52	50	importlib.metadata.EntryPoint(
53		- name=tests.data.faulty_entry_callable.key,
	51	+ name=data.faulty_entry_callable.key,
54	52	group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
55	53	value="tests.data: faulty_entry_callable",
56	54	),
...	...	@@ -60,7 +58,7 @@ class Parametrize(types.SimpleNamespace):
60	58	pytest.param(
61	59	[
62	60	importlib.metadata.EntryPoint(
63		- name=tests.data.faulty_entry_name_exists.key,
	61	+ name=data.faulty_entry_name_exists.key,
64	62	group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
65	63	value="tests.data: faulty_entry_name_exists",
66	64	),
...	...	@@ -70,7 +68,7 @@ class Parametrize(types.SimpleNamespace):
70	68	pytest.param(
71	69	[
72	70	importlib.metadata.EntryPoint(
73		- name=tests.data.faulty_entry_alias_exists.key,
	71	+ name=data.faulty_entry_alias_exists.key,
74	72	group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
75	73	value="tests.data: faulty_entry_alias_exists",
76	74	),
...	...	@@ -85,12 +83,12 @@ class Parametrize(types.SimpleNamespace):
85	83	pytest.param(
86	84	[
87	85	importlib.metadata.EntryPoint(
88		- name=tests.data.posix_entry.key,
	86	+ name=data.posix_entry.key,
89	87	group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
90	88	value="tests.data: posix_entry",
91	89	),
92	90	importlib.metadata.EntryPoint(
93		- name=tests.data.the_annoying_os_entry.key,
	91	+ name=data.the_annoying_os_entry.key,
94	92	group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
95	93	value="tests.data: the_annoying_os_entry",
96	94	),
...	...	@@ -100,12 +98,12 @@ class Parametrize(types.SimpleNamespace):
100	98	pytest.param(
101	99	[
102	100	importlib.metadata.EntryPoint(
103		- name=tests.data.callables.provider_entry1.key,
	101	+ name=callables.provider_entry1.key,
104	102	group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
105	103	value="tests.data.callables: provider_entry1",
106	104	),
107	105	importlib.metadata.EntryPoint(
108		- name=tests.data.callables.provider_entry2.key,
	106	+ name=callables.provider_entry2.key,
109	107	group=socketprovider.SocketProvider.ENTRY_POINT_GROUP_NAME,
110	108	value="tests.data.callables: provider_entry2",
111	109	),
...	...	@@ -257,7 +255,7 @@ class Parametrize(types.SimpleNamespace):
257	255	id="key-not-loaded",
258	256	),
259	257	pytest.param(
260		- tests.data.SUPPORTED_KEYS["ed25519"].public_key_data,
	258	+ data.SUPPORTED_KEYS["ed25519"].public_key_data,
261	259	True,
262	260	_types.SSH_AGENT.FAILURE,
263	261	b"",
...	...	@@ -271,10 +269,10 @@ class Parametrize(types.SimpleNamespace):
271	269	["key", "single"],
272	270	[
273	271	(value.public_key_data, False)
274		- for value in tests.data.SUPPORTED_KEYS.values()
	272	+ for value in data.SUPPORTED_KEYS.values()
275	273	]
276		- + [(tests.data.callables.list_keys_singleton()[0].key, True)],
277		- ids=[*tests.data.SUPPORTED_KEYS.keys(), "singleton"],
	274	+ + [(callables.list_keys_singleton()[0].key, True)],
	275	+ ids=[*data.SUPPORTED_KEYS.keys(), "singleton"],
278	276	)
279	277	SH_EXPORT_LINES = pytest.mark.parametrize(
280	278	["line", "env_name", "value"],
...	...	@@ -370,7 +368,7 @@ class Parametrize(types.SimpleNamespace):
370	368	b"".join([
371	369	b"\x0d",
372	370	ssh_agent.SSHAgentClient.string(
373		- tests.data.ALL_KEYS["rsa"].public_key_data
	371	+ data.ALL_KEYS["rsa"].public_key_data
374	372	),
375	373	ssh_agent.SSHAgentClient.string(vault.Vault.UUID),
376	374	b"\x00\x00\x00\x02",
...	...	@@ -383,7 +381,7 @@ class Parametrize(types.SimpleNamespace):
383	381	b"".join([
384	382	b"\x0d",
385	383	ssh_agent.SSHAgentClient.string(
386		- tests.data.ALL_KEYS["ed25519"].public_key_data
	384	+ data.ALL_KEYS["ed25519"].public_key_data
387	385	),
388	386	b"\x00\x00\x00\x08\x00\x01\x02\x03\x04\x05\x06\x07",
389	387	b"\x00\x00\x00\x00",
...	...	@@ -396,7 +394,7 @@ class Parametrize(types.SimpleNamespace):
396	394	b"".join([
397	395	b"\x0d",
398	396	ssh_agent.SSHAgentClient.string(
399		- tests.data.ALL_KEYS["dsa1024"].public_key_data
	397	+ data.ALL_KEYS["dsa1024"].public_key_data
400	398	),
401	399	ssh_agent.SSHAgentClient.string(vault.Vault.UUID),
402	400	b"\x00\x00\x00\x00",
...	...	@@ -419,8 +417,8 @@ class Parametrize(types.SimpleNamespace):
419	417	)
420	418	PUBLIC_KEY_DATA = pytest.mark.parametrize(
421	419	"public_key_struct",
422		- list(tests.data.SUPPORTED_KEYS.values()),
423		- ids=list(tests.data.SUPPORTED_KEYS.keys()),
	420	+ list(data.SUPPORTED_KEYS.values()),
	421	+ ids=list(data.SUPPORTED_KEYS.keys()),
424	422	)
425	423	REQUEST_ERROR_RESPONSES = pytest.mark.parametrize(
426	424	["request_code", "response_code", "exc_type", "exc_pattern"],
...	...	@@ -488,13 +486,13 @@ class Parametrize(types.SimpleNamespace):
488	486	)
489	487	SUPPORTED_SSH_TEST_KEYS = pytest.mark.parametrize(
490	488	["ssh_test_key_type", "ssh_test_key"],
491		- list(tests.data.SUPPORTED_KEYS.items()),
492		- ids=tests.data.SUPPORTED_KEYS.keys(),
	489	+ list(data.SUPPORTED_KEYS.items()),
	490	+ ids=data.SUPPORTED_KEYS.keys(),
493	491	)
494	492	UNSUITABLE_SSH_TEST_KEYS = pytest.mark.parametrize(
495	493	["ssh_test_key_type", "ssh_test_key"],
496		- list(tests.data.UNSUITABLE_KEYS.items()),
497		- ids=tests.data.UNSUITABLE_KEYS.keys(),
	494	+ list(data.UNSUITABLE_KEYS.items()),
	495	+ ids=data.UNSUITABLE_KEYS.keys(),
498	496	)
499	497	RESOLVE_CHAINS = pytest.mark.parametrize(
500	498	["terminal", "chain"],
...	...	@@ -518,10 +516,10 @@ class TestTestingMachineryStubbedSSHAgentSocket:
518	516	monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
519	517	monkeypatch.setenv(
520	518	"SSH_AUTH_SOCK",
521		- tests.machinery.StubbedSSHAgentSocketWithAddress.ADDRESS,
	519	+ machinery.StubbedSSHAgentSocketWithAddress.ADDRESS,
522	520	)
523	521	agent = stack.enter_context(
524		- tests.machinery.StubbedSSHAgentSocketWithAddress()
	522	+ machinery.StubbedSSHAgentSocketWithAddress()
525	523	)
526	524	assert "query" not in agent.enabled_extensions
527	525	query_request = (
...	...	@@ -547,10 +545,10 @@ class TestTestingMachineryStubbedSSHAgentSocket:
547	545	monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
548	546	monkeypatch.setenv(
549	547	"SSH_AUTH_SOCK",
550		- tests.machinery.StubbedSSHAgentSocketWithAddress.ADDRESS,
	548	+ machinery.StubbedSSHAgentSocketWithAddress.ADDRESS,
551	549	)
552	550	agent = stack.enter_context(
553		- tests.machinery.StubbedSSHAgentSocketWithAddressAndDeterministicDSA()
	551	+ machinery.StubbedSSHAgentSocketWithAddressAndDeterministicDSA()
554	552	)
555	553	assert "query" in agent.enabled_extensions
556	554	query_request = (
...	...	@@ -580,7 +578,7 @@ class TestTestingMachineryStubbedSSHAgentSocket:
580	578	def test_101_request_identities(self) -> None:
581	579	"""The agent implements a known list of identities."""
582	580	unstring_prefix = ssh_agent.SSHAgentClient.unstring_prefix
583		- with tests.machinery.StubbedSSHAgentSocket() as agent:
	581	+ with machinery.StubbedSSHAgentSocket() as agent:
584	582	query_request = (
585	583	# SSH string header
586	584	b"\x00\x00\x00\x01"
...	...	@@ -603,7 +601,7 @@ class TestTestingMachineryStubbedSSHAgentSocket:
603	601	_comment, message = unstring_prefix(message)
604	602	assert key
605	603	assert key in {
606		- k.public_key_data for k in tests.data.ALL_KEYS.values()
	604	+ k.public_key_data for k in data.ALL_KEYS.values()
607	605	}
608	606	assert not message
609	607
...	...	@@ -611,11 +609,11 @@ class TestTestingMachineryStubbedSSHAgentSocket:
611	609	def test_102_sign(
612	610	self,
613	611	ssh_test_key_type: str,
614		- ssh_test_key: tests.data.SSHTestKey,
	612	+ ssh_test_key: data.SSHTestKey,
615	613	) -> None:
616	614	"""The agent signs known key/message pairs."""
617	615	del ssh_test_key_type
618		- spec = tests.data.SSHTestKeyDeterministicSignatureClass.SPEC
	616	+ spec = data.SSHTestKeyDeterministicSignatureClass.SPEC
619	617	assert ssh_test_key.expected_signatures[spec].signature is not None
620	618	string = ssh_agent.SSHAgentClient.string
621	619	query_request = string(
...	...	@@ -634,21 +632,21 @@ class TestTestingMachineryStubbedSSHAgentSocket:
634	632	# expected payload: the binary signature as recorded in the test key data structure
635	633	+ string(ssh_test_key.expected_signatures[spec].signature)
636	634	)
637		- with tests.machinery.StubbedSSHAgentSocket() as agent:
	635	+ with machinery.StubbedSSHAgentSocket() as agent:
638	636	agent.sendall(query_request)
639	637	assert agent.recv(1000) == query_response
640	638
641	639	def test_120_close_multiple(self) -> None:
642	640	"""The agent can be closed repeatedly."""
643		- with tests.machinery.StubbedSSHAgentSocket() as agent:
	641	+ with machinery.StubbedSSHAgentSocket() as agent:
644	642	pass
645		- with tests.machinery.StubbedSSHAgentSocket() as agent:
	643	+ with machinery.StubbedSSHAgentSocket() as agent:
646	644	pass
647	645	del agent
648	646
649	647	def test_121_closed_agents_cannot_be_interacted_with(self) -> None:
650	648	"""The agent can be closed repeatedly."""
651		- with tests.machinery.StubbedSSHAgentSocket() as agent:
	649	+ with machinery.StubbedSSHAgentSocket() as agent:
652	650	pass
653	651	query_request = (
654	652	# SSH string header
...	...	@@ -662,7 +660,7 @@ class TestTestingMachineryStubbedSSHAgentSocket:
662	660	with pytest.raises(
663	661	ValueError,
664	662	match=re.escape(
665		- tests.machinery.StubbedSSHAgentSocket._SOCKET_IS_CLOSED
	663	+ machinery.StubbedSSHAgentSocket._SOCKET_IS_CLOSED
666	664	),
667	665	):
668	666	agent.sendall(query_request)
...	...	@@ -670,11 +668,11 @@ class TestTestingMachineryStubbedSSHAgentSocket:
670	668
671	669	def test_122_no_recv_without_sendall(self) -> None:
672	670	"""The agent requires a message before sending a response."""
673		- with tests.machinery.StubbedSSHAgentSocket() as agent: # noqa: SIM117
	671	+ with machinery.StubbedSSHAgentSocket() as agent: # noqa: SIM117
674	672	with pytest.raises(
675	673	AssertionError,
676	674	match=re.escape(
677		- tests.machinery.StubbedSSHAgentSocket._PROTOCOL_VIOLATION
	675	+ machinery.StubbedSSHAgentSocket._PROTOCOL_VIOLATION
678	676	),
679	677	):
680	678	agent.recv(100)
...	...	@@ -691,7 +689,7 @@ class TestTestingMachineryStubbedSSHAgentSocket:
691	689	# response code: SSH_AGENT_FAILURE
692	690	b"\x05"
693	691	)
694		- with tests.machinery.StubbedSSHAgentSocket() as agent:
	692	+ with machinery.StubbedSSHAgentSocket() as agent:
695	693	agent.sendall(message)
696	694	assert agent.recv(100) == query_response
697	695
...	...	@@ -707,7 +705,7 @@ class TestTestingMachineryStubbedSSHAgentSocket:
707	705	# response code: SSH_AGENT_FAILURE
708	706	b"\x05"
709	707	)
710		- with tests.machinery.StubbedSSHAgentSocket() as agent:
	708	+ with machinery.StubbedSSHAgentSocket() as agent:
711	709	agent.sendall(message)
712	710	assert agent.recv(100) == query_response
713	711
...	...	@@ -729,7 +727,7 @@ class TestTestingMachineryStubbedSSHAgentSocket:
729	727	stack.enter_context(
730	728	pytest.raises(exception, match=re.escape(match))
731	729	)
732		- tests.machinery.StubbedSSHAgentSocketWithAddress()
	730	+ machinery.StubbedSSHAgentSocketWithAddress()
733	731
734	732
735	733	class TestStaticFunctionality:
...	...	@@ -785,7 +783,7 @@ class TestStaticFunctionality:
785	783	@Parametrize.PUBLIC_KEY_DATA
786	784	def test_100_key_decoding(
787	785	self,
788		- public_key_struct: tests.data.SSHTestKey,
	786	+ public_key_struct: data.SSHTestKey,
789	787	) -> None:
790	788	"""The [`tests.ALL_KEYS`][] public key data looks sane."""
791	789	keydata = base64.b64decode(
...	...	@@ -802,14 +800,14 @@ class TestStaticFunctionality:
802	800	"""[`tests.parse_sh_export_line`][] works."""
803	801	if value is not None:
804	802	assert (
805		- tests.data.callables.parse_sh_export_line(
	803	+ callables.parse_sh_export_line(
806	804	line, env_name=env_name
807	805	)
808	806	== value
809	807	)
810	808	else:
811	809	with pytest.raises(ValueError, match="Cannot parse sh line:"):
812		- tests.data.callables.parse_sh_export_line(
	810	+ callables.parse_sh_export_line(
813	811	line, env_name=env_name
814	812	)
815	813
...	...	@@ -1056,14 +1054,14 @@ class TestStaticFunctionality:
1056	1054	"""Finding all SSH agent socket providers works."""
1057	1055	resolve = socketprovider.SocketProvider.resolve
1058	1056	old_registry = socketprovider.SocketProvider.registry
1059		- with tests.machinery.pytest.faked_entry_point_list(
	1057	+ with pytest_machinery.faked_entry_point_list(
1060	1058	additional_entry_points, remove_conflicting_entries=False
1061	1059	) as names:
1062	1060	socketprovider.SocketProvider._find_all_ssh_agent_socket_providers()
1063	1061	for name in names:
1064	1062	assert name in socketprovider.SocketProvider.registry
1065	1063	assert resolve(name) in {
1066		- tests.data.callables.provider_entry_provider,
	1064	+ callables.provider_entry_provider,
1067	1065	*old_registry.values(),
1068	1066	}
1069	1067
...	...	@@ -1075,7 +1073,7 @@ class TestStaticFunctionality:
1075	1073	"""Finding faulty SSH agent socket providers raises errors."""
1076	1074	with contextlib.ExitStack() as stack:
1077	1075	stack.enter_context(
1078		- tests.machinery.pytest.faked_entry_point_list(
	1076	+ pytest_machinery.faked_entry_point_list(
1079	1077	additional_entry_points, remove_conflicting_entries=False
1080	1078	)
1081	1079	)
...	...	@@ -1246,7 +1244,7 @@ class TestAgentInteraction:
1246	1244	self,
1247	1245	ssh_agent_client_with_test_keys_loaded: ssh_agent.SSHAgentClient,
1248	1246	ssh_test_key_type: str,
1249		- ssh_test_key: tests.data.SSHTestKey,
	1247	+ ssh_test_key: data.SSHTestKey,
1250	1248	) -> None:
1251	1249	"""Signing data with specific SSH keys works.
1252	1250
...	...	@@ -1259,11 +1257,11 @@ class TestAgentInteraction:
1259	1257	key_comment_pairs = {bytes(k): bytes(c) for k, c in client.list_keys()}
1260	1258	public_key_data = ssh_test_key.public_key_data
1261	1259	assert (
1262		- tests.data.SSHTestKeyDeterministicSignatureClass.SPEC
	1260	+ data.SSHTestKeyDeterministicSignatureClass.SPEC
1263	1261	in ssh_test_key.expected_signatures
1264	1262	)
1265	1263	sig = ssh_test_key.expected_signatures[
1266		- tests.data.SSHTestKeyDeterministicSignatureClass.SPEC
	1264	+ data.SSHTestKeyDeterministicSignatureClass.SPEC
1267	1265	]
1268	1266	expected_signature = sig.signature
1269	1267	derived_passphrase = sig.derived_passphrase
...	...	@@ -1291,7 +1289,7 @@ class TestAgentInteraction:
1291	1289	self,
1292	1290	ssh_agent_client_with_test_keys_loaded: ssh_agent.SSHAgentClient,
1293	1291	ssh_test_key_type: str,
1294		- ssh_test_key: tests.data.SSHTestKey,
	1292	+ ssh_test_key: data.SSHTestKey,
1295	1293	) -> None:
1296	1294	"""Using an unsuitable key with [`vault.Vault`][] fails.
1297	1295
...	...	@@ -1336,11 +1334,11 @@ class TestAgentInteraction:
1336	1334	def key_is_suitable(key: bytes) -> bool:
1337	1335	"""Stub out [`vault.Vault.key_is_suitable`][]."""
1338	1336	always = {
1339		- v.public_key_data for v in tests.data.SUPPORTED_KEYS.values()
	1337	+ v.public_key_data for v in data.SUPPORTED_KEYS.values()
1340	1338	}
1341	1339	dsa = {
1342	1340	v.public_key_data
1343		- for k, v in tests.data.UNSUITABLE_KEYS.items()
	1341	+ for k, v in data.UNSUITABLE_KEYS.items()
1344	1342	if k.startswith(("dsa", "ecdsa"))
1345	1343	}
1346	1344	return key in always or (
...	...	@@ -1356,11 +1354,11 @@ class TestAgentInteraction:
1356	1354	monkeypatch.setattr(
1357	1355	ssh_agent.SSHAgentClient,
1358	1356	"list_keys",
1359		- tests.data.callables.list_keys_singleton,
	1357	+ callables.list_keys_singleton,
1360	1358	)
1361	1359	keys = [
1362	1360	pair.key
1363		- for pair in tests.data.callables.list_keys_singleton()
	1361	+ for pair in callables.list_keys_singleton()
1364	1362	if key_is_suitable(pair.key)
1365	1363	]
1366	1364	index = "1"
...	...	@@ -1369,11 +1367,11 @@ class TestAgentInteraction:
1369	1367	monkeypatch.setattr(
1370	1368	ssh_agent.SSHAgentClient,
1371	1369	"list_keys",
1372		- tests.data.callables.list_keys,
	1370	+ callables.list_keys,
1373	1371	)
1374	1372	keys = [
1375	1373	pair.key
1376		- for pair in tests.data.callables.list_keys()
	1374	+ for pair in callables.list_keys()
1377	1375	if key_is_suitable(pair.key)
1378	1376	]
1379	1377	index = str(1 + keys.index(key))
...	...	@@ -1389,7 +1387,7 @@ class TestAgentInteraction:
1389	1387
1390	1388	# TODO(the-13th-letter): (Continued from above.) Update input
1391	1389	# data to use `index`/`input` directly and unconditionally.
1392		- runner = tests.machinery.CliRunner(mix_stderr=True)
	1390	+ runner = machinery.CliRunner(mix_stderr=True)
1393	1391	result = runner.invoke(
1394	1392	driver,
1395	1393	[],
...	...	@@ -1401,7 +1399,7 @@ class TestAgentInteraction:
1401	1399
1402	1400	def test_300_constructor_bad_running_agent(
1403	1401	self,
1404		- running_ssh_agent: tests.data.RunningSSHAgentInfo,
	1402	+ running_ssh_agent: data.RunningSSHAgentInfo,
1405	1403	) -> None:
1406	1404	"""Fail if the agent address is invalid."""
1407	1405	with pytest.MonkeyPatch.context() as monkeypatch:
...	...	@@ -1445,7 +1443,7 @@ class TestAgentInteraction:
1445	1443
1446	1444	def test_303_explicit_socket(
1447	1445	self,
1448		- spawn_ssh_agent: tests.data.SpawnedSSHAgentInfo,
	1446	+ spawn_ssh_agent: data.SpawnedSSHAgentInfo,
1449	1447	) -> None:
1450	1448	conn = spawn_ssh_agent.client._connection
1451	1449	ssh_agent.SSHAgentClient(socket=conn)
...	...	@@ -1453,7 +1451,7 @@ class TestAgentInteraction:
1453	1451	@Parametrize.TRUNCATED_AGENT_RESPONSES
1454	1452	def test_310_truncated_server_response(
1455	1453	self,
1456		- running_ssh_agent: tests.data.RunningSSHAgentInfo,
	1454	+ running_ssh_agent: data.RunningSSHAgentInfo,
1457	1455	response: bytes,
1458	1456	) -> None:
1459	1457	"""Fail on truncated responses from the SSH agent."""
...	...	@@ -1477,7 +1475,7 @@ class TestAgentInteraction:
1477	1475	@Parametrize.LIST_KEYS_ERROR_RESPONSES
1478	1476	def test_320_list_keys_error_responses(
1479	1477	self,
1480		- running_ssh_agent: tests.data.RunningSSHAgentInfo,
	1478	+ running_ssh_agent: data.RunningSSHAgentInfo,
1481	1479	response_code: _types.SSH_AGENT,
1482	1480	response: bytes \| bytearray,
1483	1481	exc_type: type[Exception],
...	...	@@ -1537,7 +1535,7 @@ class TestAgentInteraction:
1537	1535	@Parametrize.SIGN_ERROR_RESPONSES
1538	1536	def test_330_sign_error_responses(
1539	1537	self,
1540		- running_ssh_agent: tests.data.RunningSSHAgentInfo,
	1538	+ running_ssh_agent: data.RunningSSHAgentInfo,
1541	1539	key: bytes \| bytearray,
1542	1540	check: bool,
1543	1541	response_code: _types.SSH_AGENT,
...	...	@@ -1597,7 +1595,7 @@ class TestAgentInteraction:
1597	1595	com = b"no comment"
1598	1596	loaded_keys = [
1599	1597	Pair(v.public_key_data, com).toreadonly()
1600		- for v in tests.data.SUPPORTED_KEYS.values()
	1598	+ for v in data.SUPPORTED_KEYS.values()
1601	1599	]
1602	1600	monkeypatch.setattr(client, "list_keys", lambda: loaded_keys)
1603	1601	with pytest.raises(exc_type, match=exc_pattern):
...	...	@@ -1606,7 +1604,7 @@ class TestAgentInteraction:
1606	1604	@Parametrize.REQUEST_ERROR_RESPONSES
1607	1605	def test_340_request_error_responses(
1608	1606	self,
1609		- running_ssh_agent: tests.data.RunningSSHAgentInfo,
	1607	+ running_ssh_agent: data.RunningSSHAgentInfo,
1610	1608	request_code: _types.SSH_AGENTC,
1611	1609	response_code: _types.SSH_AGENT,
1612	1610	exc_type: type[Exception],
...	...	@@ -1635,7 +1633,7 @@ class TestAgentInteraction:
1635	1633	def test_350_query_extensions_malformed_responses(
1636	1634	self,
1637	1635	monkeypatch: pytest.MonkeyPatch,
1638		- running_ssh_agent: tests.data.RunningSSHAgentInfo,
	1636	+ running_ssh_agent: data.RunningSSHAgentInfo,
1639	1637	response_data: bytes,
1640	1638	) -> None:
1641	1639	"""Fail on malformed responses while querying extensions."""

...	...	@@ -12,14 +12,14 @@ from typing import TYPE_CHECKING
12	12	import pytest
13	13	from hypothesis import stateful, strategies
14	14
15		-import tests.machinery.pytest
16	15	from derivepassphrase.ssh_agent import socketprovider
	16	+from tests.machinery import pytest as pytest_machinery
17	17
18	18	if TYPE_CHECKING:
19	19	from derivepassphrase import _types
20	20
21	21	# All tests in this module are heavy-duty tests.
22		-pytestmark = [tests.machinery.pytest.heavy_duty]
	22	+pytestmark = [pytest_machinery.heavy_duty]
23	23
24	24
25	25	@strategies.composite

...	...	@@ -11,10 +11,9 @@ import hypothesis
11	11	import pytest
12	12	from hypothesis import strategies
13	13
14		-import tests.data
15		-import tests.data.callables
16		-import tests.machinery.hypothesis
17	14	from derivepassphrase import _types
	15	+from tests import data
	16	+from tests.machinery import hypothesis as hypothesis_machinery
18	17
19	18
20	19	class Parametrize(types.SimpleNamespace):
...	...	@@ -22,20 +21,20 @@ class Parametrize(types.SimpleNamespace):
22	21	"test_config",
23	22	[
24	23	conf
25		- for conf in tests.data.TEST_CONFIGS
	24	+ for conf in data.TEST_CONFIGS
26	25	if conf.validation_settings in {None, (True,)}
27	26	],
28		- ids=tests.data.VaultTestConfig._test_id,
	27	+ ids=data.VaultTestConfig._test_id,
29	28	)
30	29	VAULT_TEST_CONFIGS = pytest.mark.parametrize(
31	30	"test_config",
32		- tests.data.TEST_CONFIGS,
33		- ids=tests.data.VaultTestConfig._test_id,
	31	+ data.TEST_CONFIGS,
	32	+ ids=data.VaultTestConfig._test_id,
34	33	)
35	34
36	35
37	36	@Parametrize.VALID_VAULT_TEST_CONFIGS
38		-def test_200_is_vault_config(test_config: tests.data.VaultTestConfig) -> None:
	37	+def test_200_is_vault_config(test_config: data.VaultTestConfig) -> None:
39	38	"""Is this vault configuration recognized as valid/invalid?
40	39
41	40	Check all test configurations that do not need custom validation
...	...	@@ -56,14 +55,14 @@ def test_200_is_vault_config(test_config: tests.data.VaultTestConfig) -> None:
56	55
57	56
58	57	@hypothesis.given(
59		- test_config=tests.machinery.hypothesis.smudged_vault_test_config(
	58	+ test_config=hypothesis_machinery.smudged_vault_test_config(
60	59	config=strategies.sampled_from([
61		- conf for conf in tests.data.TEST_CONFIGS if conf.is_valid()
	60	+ conf for conf in data.TEST_CONFIGS if conf.is_valid()
62	61	])
63	62	)
64	63	)
65	64	def test_200a_is_vault_config_smudged(
66		- test_config: tests.data.VaultTestConfig,
	65	+ test_config: data.VaultTestConfig,
67	66	) -> None:
68	67	"""Is this vault configuration recognized as valid/invalid?
69	68
...	...	@@ -89,7 +88,7 @@ def test_200a_is_vault_config_smudged(
89	88
90	89	@Parametrize.VAULT_TEST_CONFIGS
91	90	def test_400_validate_vault_config(
92		- test_config: tests.data.VaultTestConfig,
	91	+ test_config: data.VaultTestConfig,
93	92	) -> None:
94	93	"""Validate this vault configuration.
95	94
...	...	@@ -121,14 +120,14 @@ def test_400_validate_vault_config(
121	120
122	121
123	122	@hypothesis.given(
124		- test_config=tests.machinery.hypothesis.smudged_vault_test_config(
	123	+ test_config=hypothesis_machinery.smudged_vault_test_config(
125	124	config=strategies.sampled_from([
126		- conf for conf in tests.data.TEST_CONFIGS if conf.is_smudgable()
	125	+ conf for conf in data.TEST_CONFIGS if conf.is_smudgable()
127	126	])
128	127	)
129	128	)
130	129	def test_400a_validate_vault_config_smudged(
131		- test_config: tests.data.VaultTestConfig,
	130	+ test_config: data.VaultTestConfig,
132	131	) -> None:
133	132	"""Validate this vault configuration.
134	133

...	...	@@ -10,11 +10,11 @@ import hypothesis
10	10	from hypothesis import strategies
11	11	from typing_extensions import Any
12	12
13		-import tests.machinery.pytest
14	13	from derivepassphrase import _types
	14	+from tests.machinery import pytest as pytest_machinery
15	15
16	16	# All tests in this module are heavy-duty tests.
17		-pytestmark = [tests.machinery.pytest.heavy_duty]
	17	+pytestmark = [pytest_machinery.heavy_duty]
18	18
19	19
20	20	@strategies.composite

...	...	@@ -17,8 +17,8 @@ import pytest
17	17	from hypothesis import strategies
18	18	from typing_extensions import TypeVar
19	19
20		-import tests.machinery.hypothesis
21	20	from derivepassphrase import vault
	21	+from tests.machinery import hypothesis as hypothesis_machinery
22	22
23	23	if TYPE_CHECKING:
24	24	from collections.abc import Callable, Iterator
...	...	@@ -503,7 +503,7 @@ class TestVault:
503	503	min_size=1,
504	504	max_size=32,
505	505	),
506		- config=tests.machinery.hypothesis.vault_full_service_config(),
	506	+ config=hypothesis_machinery.vault_full_service_config(),
507	507	services=strategies.lists(
508	508	strategies.binary(min_size=1, max_size=32),
509	509	min_size=2,
...	...	@@ -629,7 +629,7 @@ class TestVault:
629	629	phrase=strategies.one_of(
630	630	strategies.binary(min_size=1), strategies.text(min_size=1)
631	631	),
632		- config=tests.machinery.hypothesis.vault_full_service_config(),
	632	+ config=hypothesis_machinery.vault_full_service_config(),
633	633	service=strategies.text(min_size=1),
634	634	)
635	635	@hypothesis.example(
636	636