derivepassphrase.git

@@ -19,12 +19,13 @@ import stat

 import tempfile

 import types

 import zipfile

-from typing import TYPE_CHECKING

+from typing import TYPE_CHECKING, TypedDict

+import click.testing

 import hypothesis

 import pytest

 from hypothesis import strategies

-from typing_extensions import NamedTuple, Self, assert_never

+from typing_extensions import NamedTuple, assert_never

 from derivepassphrase import _types, cli, ssh_agent, vault

 from derivepassphrase._internals import cli_helpers, cli_machinery

@@ -35,8 +36,8 @@ if TYPE_CHECKING:

     import socket

     from collections.abc import Callable, Iterator, Mapping, Sequence

     from contextlib import AbstractContextManager

+    from typing import IO, NotRequired

-    import click.testing

     from typing_extensions import Any

@@ -1699,7 +1700,7 @@ def phrase_from_key(

 @contextlib.contextmanager

 def isolated_config(

     monkeypatch: pytest.MonkeyPatch,

-    runner: click.testing.CliRunner,

+    runner: CliRunner,

     main_config_str: str | None = None,

 ) -> Iterator[None]:

     """Provide an isolated configuration setup, as a context.

@@ -1752,7 +1753,7 @@ def isolated_config(

 @contextlib.contextmanager

 def isolated_vault_config(

     monkeypatch: pytest.MonkeyPatch,

-    runner: click.testing.CliRunner,

+    runner: CliRunner,

     vault_config: Any,

     main_config_str: str | None = None,

 ) -> Iterator[None]:

@@ -1790,7 +1791,7 @@ def isolated_vault_config(

 @contextlib.contextmanager

 def isolated_vault_exporter_config(

     monkeypatch: pytest.MonkeyPatch,

-    runner: click.testing.CliRunner,

+    runner: CliRunner,

     vault_config: str | bytes | None = None,

     vault_key: str | None = None,

 ) -> Iterator[None]:

@@ -1949,18 +1950,9 @@ class ReadableResult(NamedTuple):

     exception: BaseException | None

     exit_code: int

-    output: str

+    stdout: str

     stderr: str

-    @classmethod

-    def parse(cls, r: click.testing.Result, /) -> Self:

-        """Return a readable result object, given a result."""

-        try:

-            stderr = r.stderr

-        except ValueError:

-            stderr = r.output

-        return cls(r.exception, r.exit_code, r.output or '', stderr or '')

-

     def clean_exit(

         self, *, output: str = '', empty_stderr: bool = False

     ) -> bool:

@@ -1979,7 +1971,7 @@ class ReadableResult(NamedTuple):

                     and self.exit_code == 0

                 )

             )

-            and (not output or output in self.output)

+            and (not output or output in self.stdout)

             and (not empty_stderr or not self.stderr)

         )

@@ -2025,6 +2017,92 @@ class ReadableResult(NamedTuple):

             )

+class CliRunner:

+    """An abstracted CLI runner class.

+

+    Intended to provide similar functionality and scope as the

+    [`click.testing.CliRunner`][] class, though not necessarily

+    `click`-specific.  Also allows for seamless migration away from

+    `click`, if/when we decide this.

+

+    """

+

+    _SUPPORTS_MIX_STDERR_ATTRIBUTE = not hasattr(click.testing, 'StreamMixer')

+    """

+    True if and only if [`click.testing.CliRunner`][] supports the

+    `mix_stderr` attribute.  It was removed in 8.2.0 in favor of the

+    [`click.testing.StreamMixer`][] class.

+

+    See also

+    [`pallets/click#2523`](https://github.com/pallets/click/pull/2523).

+    """

+

+    def __init__(

+        self,

+        *,

+        mix_stderr: bool = False,

+        color: bool | None = None,

+    ) -> None:

+        self.color = color

+        self.mix_stderr = mix_stderr

+

+        class MixStderrAttribute(TypedDict):

+            mix_stderr: NotRequired[bool]

+

+        mix_stderr_args: MixStderrAttribute = (

+            {'mix_stderr': mix_stderr}

+            if self._SUPPORTS_MIX_STDERR_ATTRIBUTE

+            else {}

+        )

+        self.click_testing_clirunner = click.testing.CliRunner(

+            **mix_stderr_args

+        )

+

+    def invoke(

+        self,

+        cli: click.BaseCommand,

+        args: Sequence[str] | str | None = None,

+        input: str | bytes | IO[Any] | None = None,

+        env: Mapping[str, str | None] | None = None,

+        catch_exceptions: bool = True,

+        color: bool | None = None,

+        **extra: Any,

+    ) -> ReadableResult:

+        if color is None:  # pragma: no cover

+            color = self.color if self.color is not None else False

+        raw_result = self.click_testing_clirunner.invoke(

+            cli,

+            args=args,

+            input=input,

+            env=env,

+            catch_exceptions=catch_exceptions,

+            color=color,

+            **extra,

+        )

+        # In 8.2.0, r.stdout is no longer a property aliasing the

+        # `output` attribute, but rather the raw stdout value.

+        try:

+            stderr = raw_result.stderr

+        except ValueError:

+            stderr = raw_result.stdout

+        return ReadableResult(

+            raw_result.exception,

+            raw_result.exit_code,

+            (raw_result.stdout if not self.mix_stderr else raw_result.output)

+            or '',

+            stderr or '',

+        )

+        return ReadableResult.parse(raw_result)

+

+    def isolated_filesystem(

+        self,

+        temp_dir: str | os.PathLike[str] | None = None,

+    ) -> AbstractContextManager[str]:

+        return self.click_testing_clirunner.isolated_filesystem(

+            temp_dir=temp_dir

+        )

+

+

 def parse_sh_export_line(line: str, *, env_name: str) -> str:

     """Parse the output of typical SSH agents' SSH_AUTH_SOCK lines.

@@ -317,8 +317,8 @@ def vault_config_exporter_shell_interpreter(  # noqa: C901

     *,

     prog_name_list: list[str] | None = None,

     command: click.BaseCommand | None = None,

-    runner: click.testing.CliRunner | None = None,

-) -> Iterator[click.testing.Result]:

+    runner: tests.CliRunner | None = None,

+) -> Iterator[tests.ReadableResult]:

     """A rudimentary sh(1) interpreter for `--export-as=sh` output.

     Assumes a script as emitted by `derivepassphrase vault

@@ -335,7 +335,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 = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

     n = len(prog_name_list)

     it = iter(script)

     while True:

@@ -1666,7 +1666,7 @@ class TestAllCLI:

         TODO: Do we actually need this?  What should we check for?

         """

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -1678,10 +1678,9 @@ class TestAllCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase, ['--help'], catch_exceptions=False

             )

-            result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(

             empty_stderr=True, output='currently implemented subcommands'

         ), 'expected clean exit, and known help text'

@@ -1696,7 +1695,7 @@ class TestAllCLI:

         TODO: Do we actually need this?  What should we check for?

         """

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -1708,12 +1707,11 @@ class TestAllCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase,

                 ['export', '--help'],

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(

             empty_stderr=True, output='only available subcommand'

         ), 'expected clean exit, and known help text'

@@ -1728,7 +1726,7 @@ class TestAllCLI:

         TODO: Do we actually need this?  What should we check for?

         """

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -1740,12 +1738,11 @@ class TestAllCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase,

                 ['export', 'vault', '--help'],

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(

             empty_stderr=True, output='Export a vault-native configuration'

         ), 'expected clean exit, and known help text'

@@ -1760,7 +1757,7 @@ class TestAllCLI:

         TODO: Do we actually need this?  What should we check for?

         """

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -1772,12 +1769,11 @@ class TestAllCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase,

                 ['vault', '--help'],

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(

             empty_stderr=True, output='Passphrase generation:\n'

         ), 'expected clean exit, and option groups in help text'

@@ -1794,7 +1790,7 @@ class TestAllCLI:

         non_eager_arguments: list[str],

     ) -> None:

         """Eager options terminate option and argument processing."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -1806,12 +1802,11 @@ class TestAllCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase,

                 [*command, *arguments, *non_eager_arguments],

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(empty_stderr=True), 'expected clean exit'

     @Parametrize.NO_COLOR

@@ -1830,7 +1825,7 @@ class TestAllCLI:

         # Force color on if force_color.  Otherwise force color off if

         # no_color.  Otherwise set color if and only if we have a TTY.

         color = force_color or not no_color if isatty else force_color

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -1846,14 +1841,13 @@ class TestAllCLI:

                 monkeypatch.setenv('NO_COLOR', 'yes')

             if force_color:

                 monkeypatch.setenv('FORCE_COLOR', 'yes')

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase,

                 command_line,

                 input=input,

                 catch_exceptions=False,

                 color=isatty,

             )

-            result = tests.ReadableResult.parse(result_)

         assert (

             not color

             or '\x1b[0m' in result.stderr

@@ -1876,7 +1870,7 @@ class TestAllCLI:

         subcommands.

         """

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -1888,15 +1882,14 @@ class TestAllCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase,

                 ['--version'],

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(empty_stderr=True), 'expected clean exit'

-        assert result.output.strip(), 'expected version output'

-        version_data = parse_version_output(result.output)

+        assert result.stdout.strip(), 'expected version output'

+        version_data = parse_version_output(result.stdout)

         actually_known_schemes = dict.fromkeys(_types.DerivationScheme, True)

         subcommands = set(_types.Subcommand)

         assert version_data.derivation_schemes == actually_known_schemes

@@ -1918,7 +1911,7 @@ class TestAllCLI:

         of subcommands.

         """

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -1930,15 +1923,14 @@ class TestAllCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase,

                 ['export', '--version'],

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(empty_stderr=True), 'expected clean exit'

-        assert result.output.strip(), 'expected version output'

-        version_data = parse_version_output(result.output)

+        assert result.stdout.strip(), 'expected version output'

+        version_data = parse_version_output(result.stdout)

         actually_known_formats: dict[str, bool] = {

             _types.ForeignConfigurationFormat.VAULT_STOREROOM: False,

             _types.ForeignConfigurationFormat.VAULT_V02: False,

@@ -1967,7 +1959,7 @@ class TestAllCLI:

         configuration formats, and a list of available PEP 508 extras.

         """

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -1979,15 +1971,14 @@ class TestAllCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase,

                 ['export', 'vault', '--version'],

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(empty_stderr=True), 'expected clean exit'

-        assert result.output.strip(), 'expected version output'

-        version_data = parse_version_output(result.output)

+        assert result.stdout.strip(), 'expected version output'

+        version_data = parse_version_output(result.stdout)

         actually_known_formats: dict[str, bool] = {}

         actually_enabled_extras: set[str] = set()

         with contextlib.suppress(ModuleNotFoundError):

@@ -2021,7 +2012,7 @@ class TestAllCLI:

         first paragraph.

         """

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2033,15 +2024,14 @@ class TestAllCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase,

                 ['vault', '--version'],

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(empty_stderr=True), 'expected clean exit'

-        assert result.output.strip(), 'expected version output'

-        version_data = parse_version_output(result.output)

+        assert result.stdout.strip(), 'expected version output'

+        version_data = parse_version_output(result.stdout)

         features: dict[str, bool] = {

             _types.Feature.SSH_KEY: hasattr(socket, 'AF_UNIX'),

         }

@@ -2059,7 +2049,7 @@ class TestCLI:

         self,

     ) -> None:

         """The `--help` option emits help text."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2071,12 +2061,11 @@ class TestCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['--help'],

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(

             empty_stderr=True, output='Passphrase generation:\n'

         ), 'expected clean exit, and option groups in help text'

@@ -2090,7 +2079,7 @@ class TestCLI:

         self,

     ) -> None:

         """The `--version` option emits version information."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2102,12 +2091,11 @@ class TestCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['--version'],

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(empty_stderr=True, output=cli.PROG_NAME), (

             'expected clean exit, and program name in version text'

         )

@@ -2123,7 +2111,7 @@ 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 = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2138,16 +2126,15 @@ class TestCLI:

             monkeypatch.setattr(

                 cli_helpers, 'prompt_for_passphrase', tests.auto_prompt

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 [option, '0', '-p', '--', DUMMY_SERVICE],

                 input=DUMMY_PASSPHRASE,

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(empty_stderr=True), 'expected clean exit:'

         for c in charset:

-            assert c not in result.output, (

+            assert c not in result.stdout, (

                 f'derived password contains forbidden character {c!r}'

             )

@@ -2155,7 +2142,7 @@ class TestCLI:

         self,

     ) -> None:

         """Character repetition can be disabled on the command-line."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2170,21 +2157,20 @@ class TestCLI:

             monkeypatch.setattr(

                 cli_helpers, 'prompt_for_passphrase', tests.auto_prompt

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['--repeat', '0', '-p', '--', DUMMY_SERVICE],

                 input=DUMMY_PASSPHRASE,

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(empty_stderr=True), (

             'expected clean exit and empty stderr'

         )

-        passphrase = result.output.rstrip('\r\n')

+        passphrase = result.stdout.rstrip('\r\n')

         for i in range(len(passphrase) - 1):

             assert passphrase[i : i + 1] != passphrase[i + 1 : i + 2], (

                 f'derived password contains repeated character '

-                f'at position {i}: {result.output!r}'

+                f'at position {i}: {result.stdout!r}'

             )

     @Parametrize.CONFIG_WITH_KEY

@@ -2193,7 +2179,7 @@ class TestCLI:

         config: _types.VaultConfig,

     ) -> None:

         """A stored configured SSH key will be used."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2209,28 +2195,28 @@ class TestCLI:

             monkeypatch.setattr(

                 vault.Vault, 'phrase_from_key', tests.phrase_from_key

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['--', DUMMY_SERVICE],

                 catch_exceptions=False,

             )

-        result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(empty_stderr=True), (

             'expected clean exit and empty stderr'

         )

-        assert result_.stdout_bytes

-        assert result_.stdout_bytes.rstrip(b'\n') != DUMMY_RESULT_PASSPHRASE, (

-            'known false output: phrase-based instead of key-based'

-        )

-        assert result_.stdout_bytes.rstrip(b'\n') == DUMMY_RESULT_KEY1, (

-            'expected known output'

-        )

+        assert result.stdout

+        assert (

+            result.stdout.rstrip('\n').encode('UTF-8')

+            != DUMMY_RESULT_PASSPHRASE

+        ), 'known false output: phrase-based instead of key-based'

+        assert (

+            result.stdout.rstrip('\n').encode('UTF-8') == DUMMY_RESULT_KEY1

+        ), 'expected known output'

     def test_204b_key_from_command_line(

         self,

     ) -> None:

         """An SSH key requested on the command-line will be used."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2251,20 +2237,19 @@ class TestCLI:

             monkeypatch.setattr(

                 vault.Vault, 'phrase_from_key', tests.phrase_from_key

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['-k', '--', DUMMY_SERVICE],

                 input='1\n',

                 catch_exceptions=False,

             )

-        result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(), 'expected clean exit'

-        assert result_.stdout_bytes, 'expected program output'

-        last_line = result_.stdout_bytes.splitlines(True)[-1]

-        assert last_line.rstrip(b'\n') != DUMMY_RESULT_PASSPHRASE, (

-            'known false output: phrase-based instead of key-based'

-        )

-        assert last_line.rstrip(b'\n') == DUMMY_RESULT_KEY1, (

+        assert result.stdout, 'expected program output'

+        last_line = result.stdout.splitlines(True)[-1]

+        assert (

+            last_line.rstrip('\n').encode('UTF-8') != DUMMY_RESULT_PASSPHRASE

+        ), 'known false output: phrase-based instead of key-based'

+        assert last_line.rstrip('\n').encode('UTF-8') == DUMMY_RESULT_KEY1, (

             'expected known output'

         )

@@ -2277,7 +2262,7 @@ class TestCLI:

         key_index: int,

     ) -> None:

         """A command-line SSH key will override the configured key."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2295,14 +2280,13 @@ class TestCLI:

                 ssh_agent.SSHAgentClient, 'list_keys', tests.list_keys

             )

             monkeypatch.setattr(ssh_agent.SSHAgentClient, 'sign', tests.sign)

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['-k', '--', DUMMY_SERVICE],

                 input=f'{key_index}\n',

             )

-        result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(), 'expected clean exit'

-        assert result.output, 'expected program output'

+        assert result.stdout, 'expected program output'

         assert result.stderr, 'expected stderr'

         assert 'Error:' not in result.stderr, (

             'expected no error messages on stderr'

@@ -2313,7 +2297,7 @@ class TestCLI:

         running_ssh_agent: tests.RunningSSHAgentInfo,

     ) -> None:

         """A command-line passphrase will override the configured key."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2339,19 +2323,18 @@ class TestCLI:

                 ssh_agent.SSHAgentClient, 'list_keys', tests.list_keys

             )

             monkeypatch.setattr(ssh_agent.SSHAgentClient, 'sign', tests.sign)

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['--', DUMMY_SERVICE],

                 catch_exceptions=False,

             )

-        result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(), 'expected clean exit'

-        assert result_.stdout_bytes, 'expected program output'

-        last_line = result_.stdout_bytes.splitlines(True)[-1]

-        assert last_line.rstrip(b'\n') != DUMMY_RESULT_PASSPHRASE, (

-            'known false output: phrase-based instead of key-based'

-        )

-        assert last_line.rstrip(b'\n') == DUMMY_RESULT_KEY1, (

+        assert result.stdout, 'expected program output'

+        last_line = result.stdout.splitlines(True)[-1]

+        assert (

+            last_line.rstrip('\n').encode('UTF-8') != DUMMY_RESULT_PASSPHRASE

+        ), 'known false output: phrase-based instead of key-based'

+        assert last_line.rstrip('\n').encode('UTF-8') == DUMMY_RESULT_KEY1, (

             'expected known output'

         )

@@ -2364,7 +2347,7 @@ class TestCLI:

         command_line: list[str],

     ) -> None:

         """Configuring a passphrase atop an SSH key works, but warns."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2382,15 +2365,14 @@ class TestCLI:

                 ssh_agent.SSHAgentClient, 'list_keys', tests.list_keys

             )

             monkeypatch.setattr(ssh_agent.SSHAgentClient, 'sign', tests.sign)

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 command_line,

                 input=DUMMY_PASSPHRASE,

                 catch_exceptions=False,

             )

-        result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(), 'expected clean exit'

-        assert not result.output.strip(), 'expected no program output'

+        assert not result.stdout.strip(), 'expected no program output'

         assert result.stderr, 'expected known error output'

         err_lines = result.stderr.splitlines(False)

         assert err_lines[0].startswith('Passphrase:')

@@ -2422,7 +2404,7 @@ class TestCLI:

     ) -> None:

         """Service notes are printed, if they exist."""

         hypothesis.assume('Error:' not in notes)

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2445,14 +2427,13 @@ class TestCLI:

                     },

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['--', DUMMY_SERVICE],

             )

-        result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(), 'expected clean exit'

-        assert result.output, 'expected program output'

-        assert result.output.strip() == DUMMY_RESULT_PASSPHRASE.decode(

+        assert result.stdout, 'expected program output'

+        assert result.stdout.strip() == DUMMY_RESULT_PASSPHRASE.decode(

             'ascii'

         ), 'expected known program output'

         assert result.stderr or not notes.strip(), 'expected stderr'

@@ -2469,7 +2450,7 @@ class TestCLI:

         option: str,

     ) -> None:

         """Requesting invalidly many characters from a class fails."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2482,13 +2463,12 @@ class TestCLI:

                 )

             )

             for value in '-42', 'invalid':

-                result_ = runner.invoke(

+                result = runner.invoke(

                     cli.derivepassphrase_vault,

                     [option, value, '-p', '--', DUMMY_SERVICE],

                     input=DUMMY_PASSPHRASE,

                     catch_exceptions=False,

                 )

-                result = tests.ReadableResult.parse(result_)

                 assert result.error_exit(error='Invalid value'), (

                     'expected error exit and known error message'

                 )

@@ -2502,7 +2482,7 @@ class TestCLI:

         check_success: bool,

     ) -> None:

         """We require or forbid a service argument, depending on options."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2518,13 +2498,12 @@ class TestCLI:

             monkeypatch.setattr(

                 cli_helpers, 'prompt_for_passphrase', tests.auto_prompt

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 options if service else [*options, '--', DUMMY_SERVICE],

                 input=input,

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

             if service is not None:

                 err_msg = (

                     ' requires a SERVICE'

@@ -2557,13 +2536,12 @@ class TestCLI:

                 monkeypatch.setattr(

                     cli_helpers, 'prompt_for_passphrase', tests.auto_prompt

                 )

-                result_ = runner.invoke(

+                result = runner.invoke(

                     cli.derivepassphrase_vault,

                     [*options, '--', DUMMY_SERVICE] if service else options,

                     input=input,

                     catch_exceptions=False,

                 )

-                result = tests.ReadableResult.parse(result_)

             assert result.clean_exit(empty_stderr=True), 'expected clean exit'

     def test_211a_empty_service_name_causes_warning(

@@ -2583,7 +2561,7 @@ class TestCLI:

                 'An empty SERVICE is not supported by vault(1)', [record]

             )

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2599,12 +2577,11 @@ class TestCLI:

             monkeypatch.setattr(

                 cli_helpers, 'prompt_for_passphrase', tests.auto_prompt

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['--config', '--length=30', '--', ''],

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

             assert result.clean_exit(empty_stderr=False), 'expected clean exit'

             assert result.stderr is not None, 'expected known error output'

             assert all(map(is_expected_warning, caplog.record_tuples)), (

@@ -2615,13 +2592,12 @@ class TestCLI:

                 'services': {},

             }, 'requested configuration change was not applied'

             caplog.clear()

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['--import', '-'],

                 input=json.dumps({'services': {'': {'length': 40}}}),

                 catch_exceptions=False,

             )

-            result = tests.ReadableResult.parse(result_)

             assert result.clean_exit(empty_stderr=False), 'expected clean exit'

             assert result.stderr is not None, 'expected known error output'

             assert all(map(is_expected_warning, caplog.record_tuples)), (

@@ -2639,7 +2615,7 @@ class TestCLI:

         service: bool | None,

     ) -> None:

         """Incompatible options are detected."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2651,13 +2627,12 @@ class TestCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 [*options, '--', DUMMY_SERVICE] if service else options,

                 input=DUMMY_PASSPHRASE,

                 catch_exceptions=False,

             )

-        result = tests.ReadableResult.parse(result_)

         assert result.error_exit(error='mutually exclusive with '), (

             'expected error exit and known error message'

         )

@@ -2669,7 +2644,7 @@ class TestCLI:

         config: Any,

     ) -> None:

         """Importing a configuration works."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2682,7 +2657,7 @@ class TestCLI:

                     vault_config={'services': {}},

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['--import', '-'],

                 input=json.dumps(config),

@@ -2692,7 +2667,6 @@ class TestCLI:

                 subsystem='vault'

             ).read_text(encoding='UTF-8')

             config2 = json.loads(config_txt)

-        result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(empty_stderr=False), 'expected clean exit'

         assert config2 == config, 'config not imported correctly'

         assert not result.stderr or all(  # pragma: no branch

@@ -2730,7 +2704,7 @@ class TestCLI:

         _types.clean_up_falsy_vault_config_values(config2)

         # Reset caplog between hypothesis runs.

         caplog.clear()

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2743,7 +2717,7 @@ class TestCLI:

                     vault_config={'services': {}},

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['--import', '-'],

                 input=json.dumps(config),

@@ -2753,7 +2727,6 @@ class TestCLI:

                 subsystem='vault'

             ).read_text(encoding='UTF-8')

             config3 = json.loads(config_txt)

-        result = tests.ReadableResult.parse(result_)

         assert result.clean_exit(empty_stderr=False), 'expected clean exit'

         assert config3 == config2, 'config not imported correctly'

         assert not result.stderr or all(

@@ -2765,7 +2738,7 @@ class TestCLI:

         self,

     ) -> None:

         """Importing an invalid config fails."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2777,13 +2750,12 @@ class TestCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['--import', '-'],

                 input='null',

                 catch_exceptions=False,

             )

-        result = tests.ReadableResult.parse(result_)

         assert result.error_exit(error='Invalid vault config'), (

             'expected error exit and known error message'

         )

@@ -2792,7 +2764,7 @@ class TestCLI:

         self,

     ) -> None:

         """Importing an invalid config fails."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.CliRunner(mix_stderr=False)

         # TODO(the-13th-letter): Rewrite using parenthesized

         # with-statements.

         # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9

@@ -2804,13 +2776,12 @@ class TestCLI:

                     runner=runner,

                 )

             )

-            result_ = runner.invoke(

+            result = runner.invoke(

                 cli.derivepassphrase_vault,

                 ['--import', '-'],

                 input='This string is not valid JSON.',

                 catch_exceptions=False,

             )

-        result = tests.ReadableResult.parse(result_)

         assert result.error_exit(error='cannot decode JSON'), (

             'expected error exit and known error message'

         )

@@ -2819,7 +2790,7 @@ class TestCLI:

         self,

     ) -> None:

         """Importing an invalid config fails."""

-        runner = click.testing.CliRunner(mix_stderr=False)

+        runner = tests.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

@@ -2841,12 +2812,11 @@ class TestCLI:

                 'This string is not valid JSON.\n', encoding='UTF-8'

             )

             dname = cli_helpers.config_filename(subsystem=None)

-            result_ = runner.invoke(

+            result = runner.invoke(