Remove use of the monkeypatch test fixture in favor of the context manager (06c392f) - derivepassphrase.git

Remove use of the monkeypatch test fixture in favor of the context manager

Marco Ricci commited on 2025-01-25 22:15:53
Zeige 4 geänderte Dateien mit 999 Einfügungen und 360 Löschungen.

The `pytest.MonkeyPatch.context` context manager is just as easy to use,
and does not interfere with hypothesis.

tests/test_derivepassphrase_cli.py f15f291..1d5ecf6
tests/test_derivepassphrase_cli_export_vault.py 5083182..d8a17d0
tests/test_derivepassphrase_exporter.py 6cbd1d5..d50fbdf
tests/test_derivepassphrase_ssh_agent.py 265d3d5..4d87100

tests/test_derivepassphrase_cli.py

Zeige Datei @ 06c392f

@@ -348,17 +348,23 @@ class TestAllCLI:
     )
     def test_200_eager_options(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         command: list[str],
         arguments: list[str],
         non_eager_arguments: list[str],
     ) -> None:
         """Eager options terminate option and argument processing."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase,
                 [*command, *arguments, *non_eager_arguments],
@@ -394,7 +400,6 @@ class TestAllCLI:
     )
     def test_201_no_color_force_color(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         no_color: bool,
         force_color: bool,
         isatty: bool,
@@ -406,10 +411,17 @@ class TestAllCLI:
         # 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)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             if no_color:
                 monkeypatch.setenv('NO_COLOR', 'yes')
             if force_color:
@@ -437,14 +449,20 @@ class TestCLI:
 
     def test_200_help_output(
         self,
-        monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """The `--help` option emits help text."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['--help'],
@@ -460,14 +478,20 @@ class TestCLI:
 
     def test_200a_version_output(
         self,
-        monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """The `--version` option emits version information."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['--version'],
@@ -485,17 +509,27 @@ class TestCLI:
         'charset_name', ['lower', 'upper', 'number', 'space', 'dash', 'symbol']
     )
     def test_201_disable_character_set(
-        self, monkeypatch: pytest.MonkeyPatch, charset_name: str
+        self,
+        charset_name: str,
     ) -> None:
         """Named character classes can be disabled on the command-line."""
-        monkeypatch.setattr(cli, '_prompt_for_passphrase', tests.auto_prompt)
         option = f'--{charset_name}'
         charset = vault.Vault._CHARSETS[charset_name].decode('ascii')
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
+            monkeypatch.setattr(
+                cli, '_prompt_for_passphrase', tests.auto_prompt
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 [option, '0', '-p', '--', DUMMY_SERVICE],
@@ -510,15 +544,24 @@ class TestCLI:
             )
 
     def test_202_disable_repetition(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """Character repetition can be disabled on the command-line."""
-        monkeypatch.setattr(cli, '_prompt_for_passphrase', tests.auto_prompt)
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
+            monkeypatch.setattr(
+                cli, '_prompt_for_passphrase', tests.auto_prompt
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['--repeat', '0', '-p', '--', DUMMY_SERVICE],
@@ -562,14 +605,22 @@ class TestCLI:
     )
     def test_204a_key_from_config(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         config: _types.VaultConfig,
     ) -> None:
         """A stored configured SSH key will be used."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
-            monkeypatch=monkeypatch, runner=runner, vault_config=config
-        ):
+        # 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.isolated_vault_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                    vault_config=config,
+                )
+            )
             monkeypatch.setattr(
                 vault.Vault, 'phrase_from_key', tests.phrase_from_key
             )
@@ -591,15 +642,24 @@ class TestCLI:
         )
 
     def test_204b_key_from_command_line(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """An SSH key requested on the command-line will be used."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-            vault_config={'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS}},
-        ):
+                    vault_config={
+                        'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS}
+                    },
+                )
+            )
             monkeypatch.setattr(
                 cli, '_get_suitable_ssh_keys', tests.suitable_ssh_keys
             )
@@ -649,22 +709,29 @@ class TestCLI:
     @pytest.mark.parametrize('key_index', [1, 2, 3], ids=lambda i: f'index{i}')
     def test_204c_key_override_on_command_line(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         running_ssh_agent: tests.RunningSSHAgentInfo,
         config: dict[str, Any],
         key_index: int,
     ) -> None:
         """A command-line SSH key will override the configured key."""
-        with monkeypatch.context():
+        runner = click.testing.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.isolated_vault_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                    vault_config=config,
+                )
+            )
             monkeypatch.setenv('SSH_AUTH_SOCK', running_ssh_agent.socket)
             monkeypatch.setattr(
                 ssh_agent.SSHAgentClient, 'list_keys', tests.list_keys
             )
             monkeypatch.setattr(ssh_agent.SSHAgentClient, 'sign', tests.sign)
-            runner = click.testing.CliRunner(mix_stderr=False)
-            with tests.isolated_vault_config(
-                monkeypatch=monkeypatch, runner=runner, vault_config=config
-            ):
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['-k', '--', DUMMY_SERVICE],
@@ -680,18 +747,17 @@ class TestCLI:
 
     def test_205_service_phrase_if_key_in_global_config(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         running_ssh_agent: tests.RunningSSHAgentInfo,
     ) -> None:
         """A command-line passphrase will override the configured key."""
-        with monkeypatch.context():
-            monkeypatch.setenv('SSH_AUTH_SOCK', running_ssh_agent.socket)
-            monkeypatch.setattr(
-                ssh_agent.SSHAgentClient, 'list_keys', tests.list_keys
-            )
-            monkeypatch.setattr(ssh_agent.SSHAgentClient, 'sign', tests.sign)
         runner = click.testing.CliRunner(mix_stderr=False)
-            with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
@@ -703,7 +769,13 @@ class TestCLI:
                             }
                         },
                     },
-            ):
+                )
+            )
+            monkeypatch.setenv('SSH_AUTH_SOCK', running_ssh_agent.socket)
+            monkeypatch.setattr(
+                ssh_agent.SSHAgentClient, 'list_keys', tests.list_keys
+            )
+            monkeypatch.setattr(ssh_agent.SSHAgentClient, 'sign', tests.sign)
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['--', DUMMY_SERVICE],
@@ -755,25 +827,30 @@ class TestCLI:
     )
     def test_206_setting_phrase_thus_overriding_key_in_config(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         running_ssh_agent: tests.RunningSSHAgentInfo,
         caplog: pytest.LogCaptureFixture,
         config: _types.VaultConfig,
         command_line: list[str],
     ) -> None:
         """Configuring a passphrase atop an SSH key works, but warns."""
-        with monkeypatch.context():
+        runner = click.testing.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.isolated_vault_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                    vault_config=config,
+                )
+            )
             monkeypatch.setenv('SSH_AUTH_SOCK', running_ssh_agent.socket)
             monkeypatch.setattr(
                 ssh_agent.SSHAgentClient, 'list_keys', tests.list_keys
             )
             monkeypatch.setattr(ssh_agent.SSHAgentClient, 'sign', tests.sign)
-            runner = click.testing.CliRunner(mix_stderr=False)
-            with tests.isolated_vault_config(
-                monkeypatch=monkeypatch,
-                runner=runner,
-                vault_config=config,
-            ):
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 command_line,
@@ -812,14 +889,22 @@ class TestCLI:
         ],
     )
     def test_210_invalid_argument_range(
-        self, monkeypatch: pytest.MonkeyPatch, option: str
+        self,
+        option: str,
     ) -> None:
         """Requesting invalidly many characters from a class fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             for value in '-42', 'invalid':
                 result_ = runner.invoke(
                     cli.derivepassphrase_vault,
@@ -848,20 +933,28 @@ class TestCLI:
     )
     def test_211_service_needed(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         options: list[str],
         service: bool | None,
         input: str | None,
         check_success: bool,
     ) -> None:
         """We require or forbid a service argument, depending on options."""
-        monkeypatch.setattr(cli, '_prompt_for_passphrase', tests.auto_prompt)
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
+            monkeypatch.setattr(
+                cli, '_prompt_for_passphrase', tests.auto_prompt
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 options if service else [*options, '--', DUMMY_SERVICE],
@@ -883,11 +976,18 @@ class TestCLI:
                     'expected clean exit'
                 )
         if check_success:
-            with tests.isolated_vault_config(
+            # 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.isolated_vault_config(
                         monkeypatch=monkeypatch,
                         runner=runner,
                         vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-            ):
+                    )
+                )
                 monkeypatch.setattr(
                     cli, '_prompt_for_passphrase', tests.auto_prompt
                 )
@@ -902,7 +1002,6 @@ class TestCLI:
 
     def test_211a_empty_service_name_causes_warning(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Using an empty service name (where permissible) warns.
@@ -918,13 +1017,22 @@ class TestCLI:
                 'An empty SERVICE is not supported by vault(1)', [record]
             )
 
-        monkeypatch.setattr(cli, '_prompt_for_passphrase', tests.auto_prompt)
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'services': {}},
-        ):
+                )
+            )
+            monkeypatch.setattr(
+                cli, '_prompt_for_passphrase', tests.auto_prompt
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['--config', '--length=30', '--', ''],
@@ -968,16 +1076,22 @@ class TestCLI:
     )
     def test_212_incompatible_options(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         options: list[str],
         service: bool | None,
     ) -> None:
         """Incompatible options are detected."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 [*options, '--', DUMMY_SERVICE] if service else options,
@@ -999,17 +1113,23 @@ class TestCLI:
     )
     def test_213_import_config_success(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
         config: Any,
     ) -> None:
         """Importing a configuration works."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'services': {}},
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['--import', '-'],
@@ -1051,11 +1171,18 @@ class TestCLI:
         config2 = copy.deepcopy(config)
         _types.clean_up_falsy_vault_config_values(config2)
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
-            monkeypatch=pytest.MonkeyPatch(),
+        # 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.isolated_vault_config(
+                    monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'services': {}},
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['--import', '-'],
@@ -1075,11 +1202,20 @@ class TestCLI:
 
     def test_213b_import_bad_config_not_vault_config(
         self,
-        monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """Importing an invalid config fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(monkeypatch=monkeypatch, runner=runner):
+        # 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.isolated_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['--import', '-'],
@@ -1093,11 +1229,20 @@ class TestCLI:
 
     def test_213c_import_bad_config_not_json_data(
         self,
-        monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """Importing an invalid config fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(monkeypatch=monkeypatch, runner=runner):
+        # 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.isolated_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['--import', '-'],
@@ -1111,15 +1256,26 @@ class TestCLI:
 
     def test_213d_import_bad_config_not_a_file(
         self,
-        monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """Importing an invalid config fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        # `isolated_vault_config` validates the configuration.  So, to
-        # pass an actual broken configuration, we must open the
-        # configuration file ourselves afterwards, inside the context.
-        # We also might as well use `isolated_config` instead.
-        with tests.isolated_config(monkeypatch=monkeypatch, runner=runner):
+        # `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
+        # context.
+        #
+        # 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.isolated_vault_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                    vault_config={'services': {}},
+                )
+            )
             cli._config_filename(subsystem='vault').write_text(
                 'This string is not valid JSON.\n', encoding='UTF-8'
             )
@@ -1143,12 +1299,21 @@ class TestCLI:
     )
     def test_214_export_settings_no_stored_settings(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         export_options: list[str],
     ) -> None:
         """Exporting the default, empty config works."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(monkeypatch=monkeypatch, runner=runner):
+        # 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.isolated_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                )
+            )
             cli._config_filename(subsystem='vault').unlink(missing_ok=True)
             result_ = runner.invoke(
                 # Test parent context navigation by not calling
@@ -1171,14 +1336,22 @@ class TestCLI:
     )
     def test_214a_export_settings_bad_stored_config(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         export_options: list[str],
     ) -> None:
         """Exporting an invalid config fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
-            monkeypatch=monkeypatch, runner=runner, vault_config={}
-        ):
+        # 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.isolated_vault_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                    vault_config={},
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['--export', '-', *export_options],
@@ -1199,12 +1372,21 @@ class TestCLI:
     )
     def test_214b_export_settings_not_a_file(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         export_options: list[str],
     ) -> None:
         """Exporting an invalid config fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(monkeypatch=monkeypatch, runner=runner):
+        # 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.isolated_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                )
+            )
             config_file = cli._config_filename(subsystem='vault')
             config_file.unlink(missing_ok=True)
             config_file.mkdir(parents=True, exist_ok=True)
@@ -1228,12 +1410,21 @@ class TestCLI:
     )
     def test_214c_export_settings_target_not_a_file(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         export_options: list[str],
     ) -> None:
         """Exporting an invalid config fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(monkeypatch=monkeypatch, runner=runner):
+        # 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.isolated_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                )
+            )
             dname = cli._config_filename(subsystem=None)
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -1255,12 +1446,21 @@ class TestCLI:
     )
     def test_214d_export_settings_settings_directory_not_a_directory(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         export_options: list[str],
     ) -> None:
         """Exporting an invalid config fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(monkeypatch=monkeypatch, runner=runner):
+        # 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.isolated_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                )
+            )
             config_dir = cli._config_filename(subsystem=None)
             with contextlib.suppress(FileNotFoundError):
                 shutil.rmtree(config_dir)
@@ -1279,7 +1479,7 @@ class TestCLI:
         )
 
     def test_220_edit_notes_successfully(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """Editing notes works."""
         edit_result = """
@@ -1288,11 +1488,18 @@ class TestCLI:
 contents go here
 """
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
             monkeypatch.setattr(click, 'edit', lambda *a, **kw: edit_result)  # noqa: ARG005
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -1311,15 +1518,22 @@ contents go here
             }
 
     def test_221_edit_notes_noop(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """Abandoning edited notes works."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
             monkeypatch.setattr(click, 'edit', lambda *a, **kw: None)  # noqa: ARG005
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -1337,7 +1551,7 @@ contents go here
     # TODO(the-13th-letter): Keep this behavior or not, with or without
     # warning?
     def test_222_edit_notes_marker_removed(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """Removing the notes marker still saves the notes.
 
@@ -1345,11 +1559,18 @@ contents go here
 
         """
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
             monkeypatch.setattr(click, 'edit', lambda *a, **kw: 'long\ntext')  # noqa: ARG005
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -1368,15 +1589,22 @@ contents go here
             }
 
     def test_223_edit_notes_abort(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """Aborting editing notes works."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
             monkeypatch.setattr(click, 'edit', lambda *a, **kw: '\n\n')  # noqa: ARG005
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -1442,18 +1670,24 @@ contents go here
     )
     def test_224_store_config_good(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         command_line: list[str],
         input: str,
         result_config: Any,
     ) -> None:
         """Storing valid settings via `--config` works."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
             monkeypatch.setattr(
                 cli, '_get_suitable_ssh_keys', tests.suitable_ssh_keys
             )
@@ -1504,18 +1738,24 @@ contents go here
     )
     def test_225_store_config_fail(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         command_line: list[str],
         input: str,
         err_text: str,
     ) -> None:
         """Storing invalid settings via `--config` fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
             monkeypatch.setattr(
                 cli, '_get_suitable_ssh_keys', tests.suitable_ssh_keys
             )
@@ -1532,15 +1772,21 @@ contents go here
 
     def test_225a_store_config_fail_manual_no_ssh_key_selection(
         self,
-        monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """Not selecting an SSH key during `--config --key` fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
             custom_error = 'custom error message'
 
             def raiser(*_args: Any, **_kwargs: Any) -> None:
@@ -1559,17 +1805,23 @@ contents go here
 
     def test_225b_store_config_fail_manual_no_ssh_agent(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         skip_if_no_af_unix_support: None,
     ) -> None:
         """Not running an SSH agent during `--config --key` fails."""
         del skip_if_no_af_unix_support
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
             monkeypatch.delenv('SSH_AUTH_SOCK', raising=False)
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
@@ -1583,15 +1835,21 @@ contents go here
 
     def test_225c_store_config_fail_manual_bad_ssh_agent_connection(
         self,
-        monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """Not running a reachable SSH agent during `--config --key` fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
             cwd = pathlib.Path.cwd().resolve()
             monkeypatch.setenv('SSH_AUTH_SOCK', str(cwd))
             result_ = runner.invoke(
@@ -1607,16 +1865,22 @@ contents go here
     @pytest.mark.parametrize('try_race_free_implementation', [True, False])
     def test_225d_store_config_fail_manual_read_only_file(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         try_race_free_implementation: bool,
     ) -> None:
         """Using a read-only configuration file with `--config` fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
             tests.make_file_readonly(
                 cli._config_filename(subsystem='vault'),
                 try_race_free_implementation=try_race_free_implementation,
@@ -1633,15 +1897,21 @@ contents go here
 
     def test_225e_store_config_fail_manual_custom_error(
         self,
-        monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """OS-erroring with `--config` fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
             custom_error = 'custom error message'
 
             def raiser(config: Any) -> None:
@@ -1661,15 +1931,21 @@ contents go here
 
     def test_225f_store_config_fail_unset_and_set_same_settings(
         self,
-        monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """Issuing conflicting settings to `--config` fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 [
@@ -1688,17 +1964,23 @@ contents go here
 
     def test_225g_store_config_fail_manual_ssh_agent_no_keys_loaded(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         running_ssh_agent: tests.RunningSSHAgentInfo,
     ) -> None:
         """Not holding any SSH keys during `--config --key` fails."""
         del running_ssh_agent
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
 
             def func(
                 *_args: Any,
@@ -1719,17 +2001,23 @@ contents go here
 
     def test_225h_store_config_fail_manual_ssh_agent_runtime_error(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         running_ssh_agent: tests.RunningSSHAgentInfo,
     ) -> None:
         """The SSH agent erroring during `--config --key` fails."""
         del running_ssh_agent
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
 
             def raiser(*_args: Any, **_kwargs: Any) -> None:
                 raise ssh_agent.TrailingDataError()
@@ -1747,17 +2035,23 @@ contents go here
 
     def test_225i_store_config_fail_manual_ssh_agent_refuses(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         running_ssh_agent: tests.RunningSSHAgentInfo,
     ) -> None:
         """The SSH agent refusing during `--config --key` fails."""
         del running_ssh_agent
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
 
             def func(*_args: Any, **_kwargs: Any) -> NoReturn:
                 raise ssh_agent.SSHAgentFailedError(
@@ -1775,13 +2069,20 @@ contents go here
             'expected error exit and known error message'
         )
 
-    def test_226_no_arguments(self, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_226_no_arguments(self) -> None:
         """Calling `derivepassphrase vault` without any arguments fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault, [], catch_exceptions=False
             )
@@ -1791,14 +2092,21 @@ contents go here
         ), 'expected error exit and known error message'
 
     def test_226a_no_passphrase_or_key(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """Deriving a passphrase without a passphrase or key fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['--', DUMMY_SERVICE],
@@ -1810,7 +2118,7 @@ contents go here
         )
 
     def test_230_config_directory_nonexistant(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """Running without an existing config directory works.
 
@@ -1820,10 +2128,17 @@ contents go here
 
         """
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             with contextlib.suppress(FileNotFoundError):
                 shutil.rmtree(cli._config_filename(subsystem=None))
             result_ = runner.invoke(
@@ -1847,7 +2162,7 @@ contents go here
             }, 'config mismatch'
 
     def test_230a_config_directory_not_a_file(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """Erroring without an existing config directory errors normally.
 
@@ -1860,10 +2175,17 @@ contents go here
 
         """
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             save_config_ = cli._save_config
 
             def obstruct_config_saving(*args: Any, **kwargs: Any) -> Any:
@@ -1887,14 +2209,21 @@ contents go here
             )
 
     def test_230b_store_config_custom_error(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """Storing the configuration reacts even to weird errors."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             custom_error = 'custom error message'
 
             def raiser(config: Any) -> None:
@@ -2014,7 +2343,6 @@ contents go here
     )
     def test_300_unicode_normalization_form_warning(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
         main_config: str,
         command_line: list[str],
@@ -2023,14 +2351,23 @@ contents go here
     ) -> None:
         """Using unnormalized Unicode passphrases warns."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
-                'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS.copy()}
+                        'services': {
+                            DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS.copy()
+                        }
                     },
                     main_config_str=main_config,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['--debug', *command_line],
@@ -2086,7 +2423,6 @@ contents go here
     )
     def test_301_unicode_normalization_form_error(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         main_config: str,
         command_line: list[str],
         input: str | None,
@@ -2094,14 +2430,23 @@ contents go here
     ) -> None:
         """Using unknown Unicode normalization forms fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
-                'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS.copy()}
+                        'services': {
+                            DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS.copy()
+                        }
                     },
                     main_config_str=main_config,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 command_line,
@@ -2131,22 +2476,29 @@ contents go here
     )
     def test_301a_unicode_normalization_form_error_from_stored_config(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         command_line: list[str],
     ) -> None:
         """Using unknown Unicode normalization forms in the config fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={
-                'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS.copy()}
+                        'services': {
+                            DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS.copy()
+                        }
                     },
-            main_config_str=textwrap.dedent("""
-            [vault]
-            default-unicode-normalization-form = 'XXX'
-            """),
-        ):
+                    main_config_str=(
+                        "[vault]\ndefault-unicode-normalization-form = 'XXX'\n"
+                    ),
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 command_line,
@@ -2166,18 +2518,22 @@ contents go here
 
     def test_310_bad_user_config_file(
         self,
-        monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """Loading a user configuration file in an invalid format fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'services': {}},
-            main_config_str=textwrap.dedent("""
-            This file is not valid TOML.
-            """),
-        ):
+                    main_config_str='This file is not valid TOML.\n',
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_vault,
                 ['--phrase', '--', DUMMY_SERVICE],
@@ -2191,15 +2547,21 @@ contents go here
 
     def test_400_missing_af_unix_support(
         self,
-        monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """Querying the SSH agent without `AF_UNIX` support fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config={'global': {'phrase': 'abc'}, 'services': {}},
-        ):
+                )
+            )
             monkeypatch.setenv(
                 'SSH_AUTH_SOCK', "the value doesn't even matter"
             )
@@ -2238,30 +2600,43 @@ class TestCLIUtils:
         ],
     )
     def test_100_load_config(
-        self, monkeypatch: pytest.MonkeyPatch, config: Any
+        self,
+        config: Any,
     ) -> None:
         """`cli._load_config` works for valid configurations."""
-        runner = click.testing.CliRunner()
-        with tests.isolated_vault_config(
-            monkeypatch=monkeypatch, runner=runner, vault_config=config
-        ):
+        runner = click.testing.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.isolated_vault_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                    vault_config=config,
+                )
+            )
             config_filename = cli._config_filename(subsystem='vault')
             with config_filename.open(encoding='UTF-8') as fileobj:
                 assert json.load(fileobj) == config
             assert cli._load_config() == config
 
     def test_110_save_bad_config(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """`cli._save_config` fails for bad configurations."""
-        runner = click.testing.CliRunner()
+        runner = click.testing.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.isolated_vault_config(
-                    monkeypatch=monkeypatch, runner=runner, vault_config={}
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                    vault_config={},
                 )
             )
             stack.enter_context(
@@ -2392,9 +2769,10 @@ Boo.
         ), 'expected known output'
 
     def test_113_prompt_for_passphrase(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """`cli._prompt_for_passphrase` works."""
+        with pytest.MonkeyPatch.context() as monkeypatch:
             monkeypatch.setattr(
                 click,
                 'prompt',
@@ -2553,12 +2931,18 @@ Boo.
             )
             script = outfile.getvalue()
         runner = click.testing.CliRunner(mix_stderr=False)
-        monkeypatch = pytest.MonkeyPatch()
-        with tests.isolated_vault_config(
-            runner=runner,
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
+                    runner=runner,
                     vault_config={'services': {}},
-        ):
+                )
+            )
             for result_ in vault_config_exporter_shell_interpreter(script):
                 result = tests.ReadableResult.parse(result_)
                 assert result.clean_exit()
@@ -2806,19 +3190,25 @@ Boo.
     )
     def test_203_repeated_config_deletion(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         command_line: list[str],
         config: _types.VaultConfig,
         result_config: _types.VaultConfig,
     ) -> None:
         """Repeatedly removing the same parts of a configuration works."""
-        runner = click.testing.CliRunner(mix_stderr=False)
         for start_config in [config, result_config]:
-            with tests.isolated_vault_config(
+            runner = click.testing.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.isolated_vault_config(
                         monkeypatch=monkeypatch,
                         runner=runner,
                         vault_config=start_config,
-            ):
+                    )
+                )
                 result_ = runner.invoke(
                     cli.derivepassphrase_vault,
                     command_line,
@@ -2863,12 +3253,11 @@ Boo.
     @pytest.mark.parametrize('conn_hint', ['none', 'socket', 'client'])
     def test_227_get_suitable_ssh_keys(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         running_ssh_agent: tests.RunningSSHAgentInfo,
         conn_hint: str,
     ) -> None:
         """`cli._get_suitable_ssh_keys` works."""
-        with monkeypatch.context():
+        with pytest.MonkeyPatch.context() as monkeypatch:
             monkeypatch.setenv('SSH_AUTH_SOCK', running_ssh_agent.socket)
             monkeypatch.setattr(
                 ssh_agent.SSHAgentClient, 'list_keys', tests.list_keys
@@ -2899,7 +3288,6 @@ Boo.
 
     def test_400_key_to_phrase(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         skip_if_no_af_unix_support: None,
         ssh_agent_client_with_test_keys_loaded: ssh_agent.SSHAgentClient,
     ) -> None:
@@ -2924,8 +3312,11 @@ Boo.
             raise ssh_agent.TrailingDataError()
 
         del skip_if_no_af_unix_support
+        with pytest.MonkeyPatch.context() as monkeypatch:
             monkeypatch.setattr(ssh_agent.SSHAgentClient, 'sign', fail)
-        loaded_keys = list(ssh_agent_client_with_test_keys_loaded.list_keys())
+            loaded_keys = list(
+                ssh_agent_client_with_test_keys_loaded.list_keys()
+            )
             loaded_key = base64.standard_b64encode(loaded_keys[0][0])
             with monkeypatch.context() as mp:
                 mp.setattr(
@@ -2933,7 +3324,9 @@ Boo.
                     'list_keys',
                     lambda *_a, **_kw: [],
                 )
-            with pytest.raises(ErrCallback, match='not loaded into the agent'):
+                with pytest.raises(
+                    ErrCallback, match='not loaded into the agent'
+                ):
                     cli._key_to_phrase(loaded_key, error_callback=err)
             with monkeypatch.context() as mp:
                 mp.setattr(ssh_agent.SSHAgentClient, 'list_keys', fail)
@@ -2988,13 +3381,20 @@ Boo.
 class TestCLITransition:
     """Transition tests for the command-line interface up to v1.0."""
 
-    def test_100_help_output(self, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_100_help_output(self) -> None:
         """The top-level help text mentions subcommands."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase, ['--help'], catch_exceptions=False
             )
@@ -3004,14 +3404,21 @@ class TestCLITransition:
         ), 'expected clean exit, and known help text'
 
     def test_101_help_output_export(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """The "export" subcommand help text mentions subcommands."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase,
                 ['export', '--help'],
@@ -3023,14 +3430,21 @@ class TestCLITransition:
         ), 'expected clean exit, and known help text'
 
     def test_102_help_output_export_vault(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """The "export vault" subcommand help text has known content."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase,
                 ['export', 'vault', '--help'],
@@ -3042,14 +3456,21 @@ class TestCLITransition:
         ), 'expected clean exit, and known help text'
 
     def test_103_help_output_vault(
-        self, monkeypatch: pytest.MonkeyPatch
+        self,
     ) -> None:
         """The "vault" subcommand help text has known content."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase,
                 ['vault', '--help'],
@@ -3083,11 +3504,22 @@ class TestCLITransition:
         ],
     )
     def test_110_load_config_backup(
-        self, monkeypatch: pytest.MonkeyPatch, config: Any
+        self,
+        config: Any,
     ) -> None:
         """Loading the old settings file works."""
-        runner = click.testing.CliRunner()
-        with tests.isolated_config(monkeypatch=monkeypatch, runner=runner):
+        runner = click.testing.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.isolated_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                )
+            )
             cli._config_filename(subsystem='old settings.json').write_text(
                 json.dumps(config, indent=2) + '\n', encoding='UTF-8'
             )
@@ -3113,11 +3545,22 @@ class TestCLITransition:
         ],
     )
     def test_111_migrate_config(
-        self, monkeypatch: pytest.MonkeyPatch, config: Any
+        self,
+        config: Any,
     ) -> None:
         """Migrating the old settings file works."""
-        runner = click.testing.CliRunner()
-        with tests.isolated_config(monkeypatch=monkeypatch, runner=runner):
+        runner = click.testing.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.isolated_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                )
+            )
             cli._config_filename(subsystem='old settings.json').write_text(
                 json.dumps(config, indent=2) + '\n', encoding='UTF-8'
             )
@@ -3143,11 +3586,22 @@ class TestCLITransition:
         ],
     )
     def test_112_migrate_config_error(
-        self, monkeypatch: pytest.MonkeyPatch, config: Any
+        self,
+        config: Any,
     ) -> None:
         """Migrating the old settings file atop a directory fails."""
-        runner = click.testing.CliRunner()
-        with tests.isolated_config(monkeypatch=monkeypatch, runner=runner):
+        runner = click.testing.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.isolated_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                )
+            )
             cli._config_filename(subsystem='old settings.json').write_text(
                 json.dumps(config, indent=2) + '\n', encoding='UTF-8'
             )
@@ -3179,11 +3633,22 @@ class TestCLITransition:
         ],
     )
     def test_113_migrate_config_error_bad_config_value(
-        self, monkeypatch: pytest.MonkeyPatch, config: Any
+        self,
+        config: Any,
     ) -> None:
         """Migrating an invalid old settings file fails."""
-        runner = click.testing.CliRunner()
-        with tests.isolated_config(monkeypatch=monkeypatch, runner=runner):
+        runner = click.testing.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.isolated_config(
+                    monkeypatch=monkeypatch,
+                    runner=runner,
+                )
+            )
             cli._config_filename(subsystem='old settings.json').write_text(
                 json.dumps(config, indent=2) + '\n', encoding='UTF-8'
             )
@@ -3192,18 +3657,24 @@ class TestCLITransition:
 
     def test_200_forward_export_vault_path_parameter(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Forwarding arguments from "export" to "export vault" works."""
         pytest.importorskip('cryptography', minversion='38.0')
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=tests.VAULT_V03_CONFIG,
                     vault_key=tests.VAULT_MASTER_KEY,
-        ):
+                )
+            )
             monkeypatch.setenv('VAULT_KEY', tests.VAULT_MASTER_KEY)
             result_ = runner.invoke(
                 cli.derivepassphrase,
@@ -3221,16 +3692,22 @@ class TestCLITransition:
 
     def test_201_forward_export_vault_empty_commandline(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Deferring from "export" to "export vault" works."""
         pytest.importorskip('cryptography', minversion='38.0')
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase,
                 ['export'],
@@ -3251,19 +3728,27 @@ class TestCLITransition:
     )
     def test_210_forward_vault_disable_character_set(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
         charset_name: str,
     ) -> None:
         """Forwarding arguments from top-level to "vault" works."""
-        monkeypatch.setattr(cli, '_prompt_for_passphrase', tests.auto_prompt)
         option = f'--{charset_name}'
         charset = vault.Vault._CHARSETS[charset_name].decode('ascii')
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
+            monkeypatch.setattr(
+                cli, '_prompt_for_passphrase', tests.auto_prompt
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase,
                 [option, '0', '-p', '--', DUMMY_SERVICE],
@@ -3285,15 +3770,21 @@ class TestCLITransition:
 
     def test_211_forward_vault_empty_command_line(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Deferring from top-level to "vault" works."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase,
                 [],
@@ -3313,16 +3804,22 @@ class TestCLITransition:
 
     def test_300_export_using_old_config_file(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Exporting from (and migrating) the old settings file works."""
         caplog.set_level(logging.INFO)
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             cli._config_filename(subsystem='old settings.json').write_text(
                 json.dumps(
                     {'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS}},
@@ -3347,15 +3844,21 @@ class TestCLITransition:
 
     def test_300a_export_using_old_config_file_migration_error(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Exporting from (and not migrating) the old settings file fails."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_config(
+        # 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.isolated_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-        ):
+                )
+            )
             cli._config_filename(subsystem='old settings.json').write_text(
                 json.dumps(
                     {'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS}},
@@ -3390,16 +3893,22 @@ class TestCLITransition:
 
     def test_400_completion_service_name_old_config_file(
         self,
-        monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """Completing service names from the old settings file works."""
-        runner = click.testing.CliRunner(mix_stderr=False)
         config = {'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS.copy()}}
-        with tests.isolated_vault_config(
+        runner = click.testing.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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
-        ):
+                )
+            )
             old_name = cli._config_filename(subsystem='old settings.json')
             new_name = cli._config_filename(subsystem='vault')
             old_name.unlink(missing_ok=True)
@@ -4241,18 +4750,24 @@ class TestShellCompletion:
     )
     def test_203_service_names(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         config: _types.VaultConfig,
         incomplete: str,
         completions: AbstractSet[str],
     ) -> None:
         """Our completion machinery works for vault service names."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
-        ):
+                )
+            )
             comp = self.Completions(['vault'], incomplete)
             assert frozenset(comp.get_words()) == completions
 
@@ -4359,7 +4874,6 @@ class TestShellCompletion:
     )
     def test_300_shell_completion_formatting(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         shell: str,
         format_func: Callable[[click.shell_completion.CompletionItem], str],
         config: _types.VaultConfig,
@@ -4373,11 +4887,18 @@ class TestShellCompletion:
     ) -> None:
         """Custom completion functions work for all shells."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
-        ):
+                )
+            )
             expected_items = [assertable_item(item) for item in results]
             expected_string = '\n'.join(
                 format_func(completion_item(item)) for item in results
@@ -4566,7 +5087,6 @@ class TestShellCompletion:
     )
     def test_400_incompletable_service_names(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
         mode: Literal['config', 'import'],
         config: _types.VaultConfig,
@@ -4575,13 +5095,20 @@ class TestShellCompletion:
         completions: AbstractSet[str],
     ) -> None:
         """Completion skips incompletable items."""
-        runner = click.testing.CliRunner(mix_stderr=False)
         vault_config = config if mode == 'config' else {'services': {}}
-        with tests.isolated_vault_config(
+        runner = click.testing.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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=vault_config,
-        ):
+                )
+            )
             if mode == 'config':
                 result_ = runner.invoke(
                     cli.derivepassphrase_vault,
@@ -4609,15 +5136,23 @@ class TestShellCompletion:
 
     def test_410a_service_name_exceptions_not_found(
         self,
-        monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """Service name completion quietly fails on missing configuration."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-            vault_config={'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS}},
-        ):
+                    vault_config={
+                        'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS}
+                    },
+                )
+            )
             cli._config_filename(subsystem='vault').unlink(missing_ok=True)
             assert not cli._shell_complete_service(
                 click.Context(cli.derivepassphrase),
@@ -4628,16 +5163,24 @@ class TestShellCompletion:
     @pytest.mark.parametrize('exc_type', [RuntimeError, KeyError, ValueError])
     def test_410b_service_name_exceptions_custom_error(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         exc_type: type[Exception],
     ) -> None:
         """Service name completion quietly fails on configuration errors."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_config(
+        # 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.isolated_vault_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
-            vault_config={'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS}},
-        ):
+                    vault_config={
+                        'services': {DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS}
+                    },
+                )
+            )
 
             def raiser(*_a: Any, **_kw: Any) -> NoReturn:
                 raise exc_type('just being difficult')  # noqa: EM101,TRY003

tests/test_derivepassphrase_cli_export_vault.py

Zeige Datei @ 06c392f

@@ -42,7 +42,7 @@ if TYPE_CHECKING:
 class TestCLI:
     """Test the command-line interface for `derivepassphrase export vault`."""
 
-    def test_200_path_parameter(self, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_200_path_parameter(self) -> None:
         """The path `VAULT_PATH` is supported.
 
         Using `VAULT_PATH` as the path looks up the actual path in the
@@ -51,12 +51,19 @@ class TestCLI:
 
         """
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=tests.VAULT_V03_CONFIG,
                     vault_key=tests.VAULT_MASTER_KEY,
-        ):
+                )
+            )
             monkeypatch.setenv('VAULT_KEY', tests.VAULT_MASTER_KEY)
             result_ = runner.invoke(
                 cli.derivepassphrase_export_vault,
@@ -66,14 +73,21 @@ class TestCLI:
         assert result.clean_exit(empty_stderr=True), 'expected clean exit'
         assert json.loads(result.output) == tests.VAULT_V03_CONFIG_DATA
 
-    def test_201_key_parameter(self, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_201_key_parameter(self) -> None:
         """The `--key` option is supported."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=tests.VAULT_V03_CONFIG,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_export_vault,
                 ['-k', tests.VAULT_MASTER_KEY, '.vault'],
@@ -107,7 +121,6 @@ class TestCLI:
     )
     def test_210_load_vault_v02_v03_storeroom(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         format: str,
         config: str | bytes,
         config_data: dict[str, Any],
@@ -119,11 +132,18 @@ class TestCLI:
 
         """
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_export_vault,
                 ['-f', format, '-k', tests.VAULT_MASTER_KEY, 'VAULT_PATH'],
@@ -137,17 +157,23 @@ class TestCLI:
 
     def test_301_vault_config_not_found(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Fail when trying to decode non-existant files/directories."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=tests.VAULT_V03_CONFIG,
                     vault_key=tests.VAULT_MASTER_KEY,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_export_vault,
                 ['does-not-exist.txt'],
@@ -164,17 +190,23 @@ class TestCLI:
 
     def test_302_vault_config_invalid(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Fail to parse invalid vault configurations (files)."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config='',
                     vault_key=tests.VAULT_MASTER_KEY,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_export_vault,
                 ['.vault'],
@@ -188,17 +220,23 @@ class TestCLI:
 
     def test_302a_vault_config_invalid_just_a_directory(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Fail to parse invalid vault configurations (directories)."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config='',
                     vault_key=tests.VAULT_MASTER_KEY,
-        ):
+                )
+            )
             p = pathlib.Path('.vault')
             p.unlink()
             p.mkdir()
@@ -215,17 +253,23 @@ class TestCLI:
 
     def test_403_invalid_vault_config_bad_signature(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Fail to parse vault configurations with invalid integrity checks."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=tests.VAULT_V02_CONFIG,
                     vault_key=tests.VAULT_MASTER_KEY,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_export_vault,
                 ['-f', 'v0.3', '.vault'],
@@ -239,17 +283,23 @@ class TestCLI:
 
     def test_500_vault_config_invalid_internal(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """The decoded vault configuration data is valid."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=tests.VAULT_V03_CONFIG,
                     vault_key=tests.VAULT_MASTER_KEY,
-        ):
+                )
+            )
 
             def export_vault_config_data(*_args: Any, **_kwargs: Any) -> None:
                 return None
@@ -300,7 +350,6 @@ class TestStoreroom:
     )
     def test_200_export_data_path_and_keys_type(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         path: str | None,
         key: str | Buffer | None,
         handler: exporter.ExportVaultConfigDataFunction,
@@ -312,12 +361,19 @@ class TestStoreroom:
 
         """
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=tests.VAULT_STOREROOM_CONFIG_ZIPPED,
                     vault_key=tests.VAULT_MASTER_KEY,
-        ):
+                )
+            )
             assert (
                 handler(path, key, format='storeroom')
                 == tests.VAULT_STOREROOM_CONFIG_DATA
@@ -339,7 +395,6 @@ class TestStoreroom:
     @pytest.mark.parametrize('config', ['xxx', 'null', '{"version": 255}'])
     def test_401_decrypt_bucket_file_bad_json_or_version(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         config: str,
     ) -> None:
         """Fail on bad or unsupported bucket file contents.
@@ -354,11 +409,18 @@ class TestStoreroom:
             signing_key=bytes(storeroom.KEY_SIZE),
             hashing_key=bytes(storeroom.KEY_SIZE),
         )
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=tests.VAULT_STOREROOM_CONFIG_ZIPPED,
-        ):
+                )
+            )
             p = pathlib.Path('.vault', '20')
             with p.open('w', encoding='UTF-8') as outfile:
                 print(config, file=outfile)
@@ -394,7 +456,6 @@ class TestStoreroom:
     )
     def test_402_export_storeroom_data_bad_master_keys_file(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         data: str,
         err_msg: str,
         handler: exporter.ExportVaultConfigDataFunction,
@@ -405,12 +466,19 @@ class TestStoreroom:
 
         """
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=tests.VAULT_STOREROOM_CONFIG_ZIPPED,
                     vault_key=tests.VAULT_MASTER_KEY,
-        ):
+                )
+            )
             p = pathlib.Path('.vault', '.keys')
             with p.open('w', encoding='UTF-8') as outfile:
                 print(data, file=outfile)
@@ -451,7 +519,6 @@ class TestStoreroom:
     )
     def test_403_export_storeroom_data_bad_directory_listing(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         zipped_config: bytes,
         error_text: str,
         handler: exporter.ExportVaultConfigDataFunction,
@@ -475,6 +542,7 @@ class TestStoreroom:
         # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
@@ -621,7 +689,6 @@ class TestVaultNativeConfig:
     )
     def test_201_export_vault_native_data_explicit_version(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         config: str,
         format: Literal['v0.2', 'v0.3'],
         result: _types.VaultConfig | type[Exception],
@@ -638,12 +705,19 @@ class TestVaultNativeConfig:
 
         """
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
                     vault_key=tests.VAULT_MASTER_KEY,
-        ):
+                )
+            )
             if isinstance(result, type):
                 with pytest.raises(result):
                     handler(None, format=format)
@@ -677,7 +751,6 @@ class TestVaultNativeConfig:
     )
     def test_202_export_data_path_and_keys_type(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         path: str | None,
         key: str | Buffer | None,
         handler: exporter.ExportVaultConfigDataFunction,
@@ -689,12 +762,19 @@ class TestVaultNativeConfig:
 
         """
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=tests.VAULT_V03_CONFIG,
                     vault_key=tests.VAULT_MASTER_KEY,
-        ):
+                )
+            )
             assert (
                 handler(path, key, format='v0.3')
                 == tests.VAULT_V03_CONFIG_DATA
@@ -719,7 +799,6 @@ class TestVaultNativeConfig:
     )
     def test_300_result_caching(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         parser_class: type[vault_native.VaultNativeConfigParser],
         config: str,
         result: dict[str, Any],
@@ -734,11 +813,18 @@ class TestVaultNativeConfig:
             return func
 
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
-        ):
+                )
+            )
             parser = parser_class(
                 base64.b64decode(config), tests.VAULT_MASTER_KEY
             )

tests/test_derivepassphrase_exporter.py

Zeige Datei @ 06c392f

@@ -43,7 +43,6 @@ class Test001ExporterUtils:
     )
     def test_200_get_vault_key(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         expected: str,
         vault_key: str | None,
         logname: str | None,
@@ -63,9 +62,16 @@ class Test001ExporterUtils:
             ('USERNAME', username),
         ]
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch, runner=runner
-        ):
+                )
+            )
             for key, value in priority_list:
                 if value is not None:
                     monkeypatch.setenv(key, value)
@@ -81,7 +87,6 @@ class Test001ExporterUtils:
     )
     def test_210_get_vault_path(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         expected: pathlib.Path,
         path: str | os.PathLike[str] | None,
     ) -> None:
@@ -91,9 +96,16 @@ class Test001ExporterUtils:
 
         """
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch, runner=runner
-        ):
+                )
+            )
             if path:
                 monkeypatch.setenv(
                     'VAULT_PATH', os.fspath(path) if path is not None else None
@@ -103,9 +115,7 @@ class Test001ExporterUtils:
                 == expected.expanduser().resolve()
             )
 
-    def test_220_register_export_vault_config_data_handler(
-        self, monkeypatch: pytest.MonkeyPatch
-    ) -> None:
+    def test_220_register_export_vault_config_data_handler(self) -> None:
         """Register vault config data export handlers."""
 
         def handler(  # pragma: no cover
@@ -117,6 +127,7 @@ class Test001ExporterUtils:
             del path, key
             raise ValueError(format)
 
+        with pytest.MonkeyPatch.context() as monkeypatch:
             registry = {'dummy': handler}
             monkeypatch.setattr(
                 exporter, '_export_vault_config_data_registry', registry
@@ -132,10 +143,9 @@ class Test001ExporterUtils:
                 'name2': handler,
             }
 
-    def test_300_get_vault_key_without_envs(
-        self, monkeypatch: pytest.MonkeyPatch
-    ) -> None:
+    def test_300_get_vault_key_without_envs(self) -> None:
         """Fail to look up the vault key in the empty environment."""
+        with pytest.MonkeyPatch.context() as monkeypatch:
             monkeypatch.delenv('VAULT_KEY', raising=False)
             monkeypatch.delenv('LOGNAME', raising=False)
             monkeypatch.delenv('USER', raising=False)
@@ -143,14 +153,13 @@ class Test001ExporterUtils:
             with pytest.raises(KeyError, match='VAULT_KEY'):
                 exporter.get_vault_key()
 
-    def test_310_get_vault_path_without_home(
-        self, monkeypatch: pytest.MonkeyPatch
-    ) -> None:
+    def test_310_get_vault_path_without_home(self) -> None:
         """Fail to look up the vault path without `HOME`."""
 
         def raiser(*_args: Any, **_kwargs: Any) -> Any:
             raise RuntimeError('Cannot determine home directory.')  # noqa: EM101,TRY003
 
+        with pytest.MonkeyPatch.context() as monkeypatch:
             monkeypatch.setattr(pathlib.Path, 'expanduser', raiser)
             monkeypatch.setattr(os.path, 'expanduser', raiser)
             with pytest.raises(
@@ -176,7 +185,6 @@ class Test001ExporterUtils:
     )
     def test_320_register_export_vault_config_data_handler_errors(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         namelist: tuple[str, ...],
         err_pat: str,
     ) -> None:
@@ -196,6 +204,7 @@ class Test001ExporterUtils:
             del path, key
             raise ValueError(format)
 
+        with pytest.MonkeyPatch.context() as monkeypatch:
             registry = {'dummy': handler}
             monkeypatch.setattr(
                 exporter, '_export_vault_config_data_registry', registry
@@ -205,11 +214,12 @@ class Test001ExporterUtils:
                     handler
                 )
 
-    def test_321_export_vault_config_data_bad_handler(
-        self, monkeypatch: pytest.MonkeyPatch
-    ) -> None:
+    def test_321_export_vault_config_data_bad_handler(self) -> None:
         """Fail to export vault config data without known handlers."""
-        monkeypatch.setattr(exporter, '_export_vault_config_data_registry', {})
+        with pytest.MonkeyPatch.context() as monkeypatch:
+            monkeypatch.setattr(
+                exporter, '_export_vault_config_data_registry', {}
+            )
             monkeypatch.setattr(
                 exporter, 'find_vault_config_data_handlers', lambda: None
             )
@@ -223,18 +233,22 @@ class Test001ExporterUtils:
 class Test002CLI:
     """Test the command-line functionality of the `exporter` subpackage."""
 
-    def test_300_invalid_format(
-        self,
-        monkeypatch: pytest.MonkeyPatch,
-    ) -> None:
+    def test_300_invalid_format(self) -> None:
         """Reject invalid vault configuration format names."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=tests.VAULT_V03_CONFIG,
                     vault_key=tests.VAULT_MASTER_KEY,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_export_vault,
                 ['-f', 'INVALID', 'VAULT_PATH'],
@@ -272,7 +286,6 @@ class Test002CLI:
     )
     def test_999_no_cryptography_error_message(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         caplog: pytest.LogCaptureFixture,
         format: str,
         config: str | bytes,
@@ -280,12 +293,19 @@ class Test002CLI:
     ) -> None:
         """Abort export call if no cryptography is available."""
         runner = click.testing.CliRunner(mix_stderr=False)
-        with tests.isolated_vault_exporter_config(
+        # 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.isolated_vault_exporter_config(
                     monkeypatch=monkeypatch,
                     runner=runner,
                     vault_config=config,
                     vault_key=key,
-        ):
+                )
+            )
             result_ = runner.invoke(
                 cli.derivepassphrase_export_vault,
                 ['-f', format, 'VAULT_PATH'],

tests/test_derivepassphrase_ssh_agent.py

Zeige Datei @ 06c392f

@@ -132,11 +132,11 @@ class TestStaticFunctionality:
 
     def test_200_constructor_no_running_agent(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         skip_if_no_af_unix_support: None,
     ) -> None:
         """Abort if the running agent cannot be located."""
         del skip_if_no_af_unix_support
+        with pytest.MonkeyPatch.context() as monkeypatch:
             monkeypatch.delenv('SSH_AUTH_SOCK', raising=False)
             with pytest.raises(
                 KeyError, match='SSH_AUTH_SOCK environment variable'
@@ -467,26 +467,20 @@ class TestAgentInteraction:
 
     def test_300_constructor_bad_running_agent(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         running_ssh_agent: tests.RunningSSHAgentInfo,
     ) -> None:
         """Fail if the agent address is invalid."""
-        with monkeypatch.context() as monkeypatch2:
-            monkeypatch2.setenv(
-                'SSH_AUTH_SOCK', running_ssh_agent.socket + '~'
-            )
+        with pytest.MonkeyPatch.context() as monkeypatch:
+            monkeypatch.setenv('SSH_AUTH_SOCK', running_ssh_agent.socket + '~')
             sock = socket.socket(family=socket.AF_UNIX)
             with pytest.raises(OSError):  # noqa: PT011
                 ssh_agent.SSHAgentClient(socket=sock)
 
-    def test_301_constructor_no_af_unix_support(
-        self,
-        monkeypatch: pytest.MonkeyPatch,
-    ) -> None:
+    def test_301_constructor_no_af_unix_support(self) -> None:
         """Fail without [`socket.AF_UNIX`][] support."""
-        with monkeypatch.context() as monkeypatch2:
-            monkeypatch2.setenv('SSH_AUTH_SOCK', "the value doesn't matter")
-            monkeypatch2.delattr(socket, 'AF_UNIX', raising=False)
+        with pytest.MonkeyPatch.context() as monkeypatch:
+            monkeypatch.setenv('SSH_AUTH_SOCK', "the value doesn't matter")
+            monkeypatch.delattr(socket, 'AF_UNIX', raising=False)
             with pytest.raises(
                 NotImplementedError,
                 match='UNIX domain sockets',
@@ -503,7 +497,6 @@ class TestAgentInteraction:
     )
     def test_310_truncated_server_response(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         running_ssh_agent: tests.RunningSSHAgentInfo,
         response: bytes,
     ) -> None:
@@ -520,6 +513,7 @@ class TestAgentInteraction:
                 return response_stream.read(*args, **kwargs)
 
         pseudo_socket = PseudoSocket()
+        with pytest.MonkeyPatch.context() as monkeypatch:
             monkeypatch.setattr(client, '_connection', pseudo_socket)
             with pytest.raises(EOFError):
                 client.request(255, b'')
@@ -552,7 +546,6 @@ class TestAgentInteraction:
     )
     def test_320_list_keys_error_responses(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         running_ssh_agent: tests.RunningSSHAgentInfo,
         response_code: _types.SSH_AGENT,
         response: bytes | bytearray,
@@ -602,9 +595,9 @@ class TestAgentInteraction:
                 )
             return response
 
-        with monkeypatch.context() as monkeypatch2:
+        with pytest.MonkeyPatch.context() as monkeypatch:
             client = ssh_agent.SSHAgentClient()
-            monkeypatch2.setattr(client, 'request', request)
+            monkeypatch.setattr(client, 'request', request)
             with pytest.raises(exc_type, match=exc_pattern):
                 client.list_keys()
 
@@ -640,7 +633,6 @@ class TestAgentInteraction:
     )
     def test_330_sign_error_responses(
         self,
-        monkeypatch: pytest.MonkeyPatch,
         running_ssh_agent: tests.RunningSSHAgentInfo,
         key: bytes | bytearray,
         check: bool,
@@ -692,16 +684,16 @@ class TestAgentInteraction:
                 )
             return response  # pragma: no cover
 
-        with monkeypatch.context() as monkeypatch2:
+        with pytest.MonkeyPatch.context() as monkeypatch:
             client = ssh_agent.SSHAgentClient()
-            monkeypatch2.setattr(client, 'request', request)
+            monkeypatch.setattr(client, 'request', request)
             Pair = _types.SSHKeyCommentPair  # noqa: N806
             com = b'no comment'
             loaded_keys = [
                 Pair(v.public_key_data, com).toreadonly()
                 for v in tests.SUPPORTED_KEYS.values()
             ]
-            monkeypatch2.setattr(client, 'list_keys', lambda: loaded_keys)
+            monkeypatch.setattr(client, 'list_keys', lambda: loaded_keys)
             with pytest.raises(exc_type, match=exc_pattern):
                 client.sign(key, b'abc', check_if_key_loaded=check)
 


...	...	@@ -42,7 +42,7 @@ if TYPE_CHECKING:
42	42	class TestCLI:
43	43	"""Test the command-line interface for `derivepassphrase export vault`."""
44	44
45		- def test_200_path_parameter(self, monkeypatch: pytest.MonkeyPatch) -> None:
	45	+ def test_200_path_parameter(self) -> None:
46	46	"""The path `VAULT_PATH` is supported.
47	47
48	48	Using `VAULT_PATH` as the path looks up the actual path in the
...	...	@@ -51,12 +51,19 @@ class TestCLI:
51	51
52	52	"""
53	53	runner = click.testing.CliRunner(mix_stderr=False)
54		- with tests.isolated_vault_exporter_config(
	54	+ # TODO(the-13th-letter): Rewrite using parenthesized
	55	+ # with-statements.
	56	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	57	+ with contextlib.ExitStack() as stack:
	58	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	59	+ stack.enter_context(
	60	+ tests.isolated_vault_exporter_config(
55	61	monkeypatch=monkeypatch,
56	62	runner=runner,
57	63	vault_config=tests.VAULT_V03_CONFIG,
58	64	vault_key=tests.VAULT_MASTER_KEY,
59		- ):
	65	+ )
	66	+ )
60	67	monkeypatch.setenv('VAULT_KEY', tests.VAULT_MASTER_KEY)
61	68	result_ = runner.invoke(
62	69	cli.derivepassphrase_export_vault,
...	...	@@ -66,14 +73,21 @@ class TestCLI:
66	73	assert result.clean_exit(empty_stderr=True), 'expected clean exit'
67	74	assert json.loads(result.output) == tests.VAULT_V03_CONFIG_DATA
68	75
69		- def test_201_key_parameter(self, monkeypatch: pytest.MonkeyPatch) -> None:
	76	+ def test_201_key_parameter(self) -> None:
70	77	"""The `--key` option is supported."""
71	78	runner = click.testing.CliRunner(mix_stderr=False)
72		- with tests.isolated_vault_exporter_config(
	79	+ # TODO(the-13th-letter): Rewrite using parenthesized
	80	+ # with-statements.
	81	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	82	+ with contextlib.ExitStack() as stack:
	83	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	84	+ stack.enter_context(
	85	+ tests.isolated_vault_exporter_config(
73	86	monkeypatch=monkeypatch,
74	87	runner=runner,
75	88	vault_config=tests.VAULT_V03_CONFIG,
76		- ):
	89	+ )
	90	+ )
77	91	result_ = runner.invoke(
78	92	cli.derivepassphrase_export_vault,
79	93	['-k', tests.VAULT_MASTER_KEY, '.vault'],
...	...	@@ -107,7 +121,6 @@ class TestCLI:
107	121	)
108	122	def test_210_load_vault_v02_v03_storeroom(
109	123	self,
110		- monkeypatch: pytest.MonkeyPatch,
111	124	format: str,
112	125	config: str \| bytes,
113	126	config_data: dict[str, Any],
...	...	@@ -119,11 +132,18 @@ class TestCLI:
119	132
120	133	"""
121	134	runner = click.testing.CliRunner(mix_stderr=False)
122		- with tests.isolated_vault_exporter_config(
	135	+ # TODO(the-13th-letter): Rewrite using parenthesized
	136	+ # with-statements.
	137	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	138	+ with contextlib.ExitStack() as stack:
	139	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	140	+ stack.enter_context(
	141	+ tests.isolated_vault_exporter_config(
123	142	monkeypatch=monkeypatch,
124	143	runner=runner,
125	144	vault_config=config,
126		- ):
	145	+ )
	146	+ )
127	147	result_ = runner.invoke(
128	148	cli.derivepassphrase_export_vault,
129	149	['-f', format, '-k', tests.VAULT_MASTER_KEY, 'VAULT_PATH'],
...	...	@@ -137,17 +157,23 @@ class TestCLI:
137	157
138	158	def test_301_vault_config_not_found(
139	159	self,
140		- monkeypatch: pytest.MonkeyPatch,
141	160	caplog: pytest.LogCaptureFixture,
142	161	) -> None:
143	162	"""Fail when trying to decode non-existant files/directories."""
144	163	runner = click.testing.CliRunner(mix_stderr=False)
145		- with tests.isolated_vault_exporter_config(
	164	+ # TODO(the-13th-letter): Rewrite using parenthesized
	165	+ # with-statements.
	166	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	167	+ with contextlib.ExitStack() as stack:
	168	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	169	+ stack.enter_context(
	170	+ tests.isolated_vault_exporter_config(
146	171	monkeypatch=monkeypatch,
147	172	runner=runner,
148	173	vault_config=tests.VAULT_V03_CONFIG,
149	174	vault_key=tests.VAULT_MASTER_KEY,
150		- ):
	175	+ )
	176	+ )
151	177	result_ = runner.invoke(
152	178	cli.derivepassphrase_export_vault,
153	179	['does-not-exist.txt'],
...	...	@@ -164,17 +190,23 @@ class TestCLI:
164	190
165	191	def test_302_vault_config_invalid(
166	192	self,
167		- monkeypatch: pytest.MonkeyPatch,
168	193	caplog: pytest.LogCaptureFixture,
169	194	) -> None:
170	195	"""Fail to parse invalid vault configurations (files)."""
171	196	runner = click.testing.CliRunner(mix_stderr=False)
172		- with tests.isolated_vault_exporter_config(
	197	+ # TODO(the-13th-letter): Rewrite using parenthesized
	198	+ # with-statements.
	199	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	200	+ with contextlib.ExitStack() as stack:
	201	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	202	+ stack.enter_context(
	203	+ tests.isolated_vault_exporter_config(
173	204	monkeypatch=monkeypatch,
174	205	runner=runner,
175	206	vault_config='',
176	207	vault_key=tests.VAULT_MASTER_KEY,
177		- ):
	208	+ )
	209	+ )
178	210	result_ = runner.invoke(
179	211	cli.derivepassphrase_export_vault,
180	212	['.vault'],
...	...	@@ -188,17 +220,23 @@ class TestCLI:
188	220
189	221	def test_302a_vault_config_invalid_just_a_directory(
190	222	self,
191		- monkeypatch: pytest.MonkeyPatch,
192	223	caplog: pytest.LogCaptureFixture,
193	224	) -> None:
194	225	"""Fail to parse invalid vault configurations (directories)."""
195	226	runner = click.testing.CliRunner(mix_stderr=False)
196		- with tests.isolated_vault_exporter_config(
	227	+ # TODO(the-13th-letter): Rewrite using parenthesized
	228	+ # with-statements.
	229	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	230	+ with contextlib.ExitStack() as stack:
	231	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	232	+ stack.enter_context(
	233	+ tests.isolated_vault_exporter_config(
197	234	monkeypatch=monkeypatch,
198	235	runner=runner,
199	236	vault_config='',
200	237	vault_key=tests.VAULT_MASTER_KEY,
201		- ):
	238	+ )
	239	+ )
202	240	p = pathlib.Path('.vault')
203	241	p.unlink()
204	242	p.mkdir()
...	...	@@ -215,17 +253,23 @@ class TestCLI:
215	253
216	254	def test_403_invalid_vault_config_bad_signature(
217	255	self,
218		- monkeypatch: pytest.MonkeyPatch,
219	256	caplog: pytest.LogCaptureFixture,
220	257	) -> None:
221	258	"""Fail to parse vault configurations with invalid integrity checks."""
222	259	runner = click.testing.CliRunner(mix_stderr=False)
223		- with tests.isolated_vault_exporter_config(
	260	+ # TODO(the-13th-letter): Rewrite using parenthesized
	261	+ # with-statements.
	262	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	263	+ with contextlib.ExitStack() as stack:
	264	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	265	+ stack.enter_context(
	266	+ tests.isolated_vault_exporter_config(
224	267	monkeypatch=monkeypatch,
225	268	runner=runner,
226	269	vault_config=tests.VAULT_V02_CONFIG,
227	270	vault_key=tests.VAULT_MASTER_KEY,
228		- ):
	271	+ )
	272	+ )
229	273	result_ = runner.invoke(
230	274	cli.derivepassphrase_export_vault,
231	275	['-f', 'v0.3', '.vault'],
...	...	@@ -239,17 +283,23 @@ class TestCLI:
239	283
240	284	def test_500_vault_config_invalid_internal(
241	285	self,
242		- monkeypatch: pytest.MonkeyPatch,
243	286	caplog: pytest.LogCaptureFixture,
244	287	) -> None:
245	288	"""The decoded vault configuration data is valid."""
246	289	runner = click.testing.CliRunner(mix_stderr=False)
247		- with tests.isolated_vault_exporter_config(
	290	+ # TODO(the-13th-letter): Rewrite using parenthesized
	291	+ # with-statements.
	292	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	293	+ with contextlib.ExitStack() as stack:
	294	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	295	+ stack.enter_context(
	296	+ tests.isolated_vault_exporter_config(
248	297	monkeypatch=monkeypatch,
249	298	runner=runner,
250	299	vault_config=tests.VAULT_V03_CONFIG,
251	300	vault_key=tests.VAULT_MASTER_KEY,
252		- ):
	301	+ )
	302	+ )
253	303
254	304	def export_vault_config_data(_args: Any, *_kwargs: Any) -> None:
255	305	return None
...	...	@@ -300,7 +350,6 @@ class TestStoreroom:
300	350	)
301	351	def test_200_export_data_path_and_keys_type(
302	352	self,
303		- monkeypatch: pytest.MonkeyPatch,
304	353	path: str \| None,
305	354	key: str \| Buffer \| None,
306	355	handler: exporter.ExportVaultConfigDataFunction,
...	...	@@ -312,12 +361,19 @@ class TestStoreroom:
312	361
313	362	"""
314	363	runner = click.testing.CliRunner(mix_stderr=False)
315		- with tests.isolated_vault_exporter_config(
	364	+ # TODO(the-13th-letter): Rewrite using parenthesized
	365	+ # with-statements.
	366	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	367	+ with contextlib.ExitStack() as stack:
	368	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	369	+ stack.enter_context(
	370	+ tests.isolated_vault_exporter_config(
316	371	monkeypatch=monkeypatch,
317	372	runner=runner,
318	373	vault_config=tests.VAULT_STOREROOM_CONFIG_ZIPPED,
319	374	vault_key=tests.VAULT_MASTER_KEY,
320		- ):
	375	+ )
	376	+ )
321	377	assert (
322	378	handler(path, key, format='storeroom')
323	379	== tests.VAULT_STOREROOM_CONFIG_DATA
...	...	@@ -339,7 +395,6 @@ class TestStoreroom:
339	395	@pytest.mark.parametrize('config', ['xxx', 'null', '{"version": 255}'])
340	396	def test_401_decrypt_bucket_file_bad_json_or_version(
341	397	self,
342		- monkeypatch: pytest.MonkeyPatch,
343	398	config: str,
344	399	) -> None:
345	400	"""Fail on bad or unsupported bucket file contents.
...	...	@@ -354,11 +409,18 @@ class TestStoreroom:
354	409	signing_key=bytes(storeroom.KEY_SIZE),
355	410	hashing_key=bytes(storeroom.KEY_SIZE),
356	411	)
357		- with tests.isolated_vault_exporter_config(
	412	+ # TODO(the-13th-letter): Rewrite using parenthesized
	413	+ # with-statements.
	414	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	415	+ with contextlib.ExitStack() as stack:
	416	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	417	+ stack.enter_context(
	418	+ tests.isolated_vault_exporter_config(
358	419	monkeypatch=monkeypatch,
359	420	runner=runner,
360	421	vault_config=tests.VAULT_STOREROOM_CONFIG_ZIPPED,
361		- ):
	422	+ )
	423	+ )
362	424	p = pathlib.Path('.vault', '20')
363	425	with p.open('w', encoding='UTF-8') as outfile:
364	426	print(config, file=outfile)
...	...	@@ -394,7 +456,6 @@ class TestStoreroom:
394	456	)
395	457	def test_402_export_storeroom_data_bad_master_keys_file(
396	458	self,
397		- monkeypatch: pytest.MonkeyPatch,
398	459	data: str,
399	460	err_msg: str,
400	461	handler: exporter.ExportVaultConfigDataFunction,
...	...	@@ -405,12 +466,19 @@ class TestStoreroom:
405	466
406	467	"""
407	468	runner = click.testing.CliRunner(mix_stderr=False)
408		- with tests.isolated_vault_exporter_config(
	469	+ # TODO(the-13th-letter): Rewrite using parenthesized
	470	+ # with-statements.
	471	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	472	+ with contextlib.ExitStack() as stack:
	473	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	474	+ stack.enter_context(
	475	+ tests.isolated_vault_exporter_config(
409	476	monkeypatch=monkeypatch,
410	477	runner=runner,
411	478	vault_config=tests.VAULT_STOREROOM_CONFIG_ZIPPED,
412	479	vault_key=tests.VAULT_MASTER_KEY,
413		- ):
	480	+ )
	481	+ )
414	482	p = pathlib.Path('.vault', '.keys')
415	483	with p.open('w', encoding='UTF-8') as outfile:
416	484	print(data, file=outfile)
...	...	@@ -451,7 +519,6 @@ class TestStoreroom:
451	519	)
452	520	def test_403_export_storeroom_data_bad_directory_listing(
453	521	self,
454		- monkeypatch: pytest.MonkeyPatch,
455	522	zipped_config: bytes,
456	523	error_text: str,
457	524	handler: exporter.ExportVaultConfigDataFunction,
...	...	@@ -475,6 +542,7 @@ class TestStoreroom:
475	542	# with-statements.
476	543	# https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
477	544	with contextlib.ExitStack() as stack:
	545	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
478	546	stack.enter_context(
479	547	tests.isolated_vault_exporter_config(
480	548	monkeypatch=monkeypatch,
...	...	@@ -621,7 +689,6 @@ class TestVaultNativeConfig:
621	689	)
622	690	def test_201_export_vault_native_data_explicit_version(
623	691	self,
624		- monkeypatch: pytest.MonkeyPatch,
625	692	config: str,
626	693	format: Literal['v0.2', 'v0.3'],
627	694	result: _types.VaultConfig \| type[Exception],
...	...	@@ -638,12 +705,19 @@ class TestVaultNativeConfig:
638	705
639	706	"""
640	707	runner = click.testing.CliRunner(mix_stderr=False)
641		- with tests.isolated_vault_exporter_config(
	708	+ # TODO(the-13th-letter): Rewrite using parenthesized
	709	+ # with-statements.
	710	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	711	+ with contextlib.ExitStack() as stack:
	712	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	713	+ stack.enter_context(
	714	+ tests.isolated_vault_exporter_config(
642	715	monkeypatch=monkeypatch,
643	716	runner=runner,
644	717	vault_config=config,
645	718	vault_key=tests.VAULT_MASTER_KEY,
646		- ):
	719	+ )
	720	+ )
647	721	if isinstance(result, type):
648	722	with pytest.raises(result):
649	723	handler(None, format=format)
...	...	@@ -677,7 +751,6 @@ class TestVaultNativeConfig:
677	751	)
678	752	def test_202_export_data_path_and_keys_type(
679	753	self,
680		- monkeypatch: pytest.MonkeyPatch,
681	754	path: str \| None,
682	755	key: str \| Buffer \| None,
683	756	handler: exporter.ExportVaultConfigDataFunction,
...	...	@@ -689,12 +762,19 @@ class TestVaultNativeConfig:
689	762
690	763	"""
691	764	runner = click.testing.CliRunner(mix_stderr=False)
692		- with tests.isolated_vault_exporter_config(
	765	+ # TODO(the-13th-letter): Rewrite using parenthesized
	766	+ # with-statements.
	767	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	768	+ with contextlib.ExitStack() as stack:
	769	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	770	+ stack.enter_context(
	771	+ tests.isolated_vault_exporter_config(
693	772	monkeypatch=monkeypatch,
694	773	runner=runner,
695	774	vault_config=tests.VAULT_V03_CONFIG,
696	775	vault_key=tests.VAULT_MASTER_KEY,
697		- ):
	776	+ )
	777	+ )
698	778	assert (
699	779	handler(path, key, format='v0.3')
700	780	== tests.VAULT_V03_CONFIG_DATA
...	...	@@ -719,7 +799,6 @@ class TestVaultNativeConfig:
719	799	)
720	800	def test_300_result_caching(
721	801	self,
722		- monkeypatch: pytest.MonkeyPatch,
723	802	parser_class: type[vault_native.VaultNativeConfigParser],
724	803	config: str,
725	804	result: dict[str, Any],
...	...	@@ -734,11 +813,18 @@ class TestVaultNativeConfig:
734	813	return func
735	814
736	815	runner = click.testing.CliRunner(mix_stderr=False)
737		- with tests.isolated_vault_exporter_config(
	816	+ # TODO(the-13th-letter): Rewrite using parenthesized
	817	+ # with-statements.
	818	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	819	+ with contextlib.ExitStack() as stack:
	820	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	821	+ stack.enter_context(
	822	+ tests.isolated_vault_exporter_config(
738	823	monkeypatch=monkeypatch,
739	824	runner=runner,
740	825	vault_config=config,
741		- ):
	826	+ )
	827	+ )
742	828	parser = parser_class(
743	829	base64.b64decode(config), tests.VAULT_MASTER_KEY
744	830	)

...	...	@@ -43,7 +43,6 @@ class Test001ExporterUtils:
43	43	)
44	44	def test_200_get_vault_key(
45	45	self,
46		- monkeypatch: pytest.MonkeyPatch,
47	46	expected: str,
48	47	vault_key: str \| None,
49	48	logname: str \| None,
...	...	@@ -63,9 +62,16 @@ class Test001ExporterUtils:
63	62	('USERNAME', username),
64	63	]
65	64	runner = click.testing.CliRunner(mix_stderr=False)
66		- with tests.isolated_vault_exporter_config(
	65	+ # TODO(the-13th-letter): Rewrite using parenthesized
	66	+ # with-statements.
	67	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	68	+ with contextlib.ExitStack() as stack:
	69	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	70	+ stack.enter_context(
	71	+ tests.isolated_vault_exporter_config(
67	72	monkeypatch=monkeypatch, runner=runner
68		- ):
	73	+ )
	74	+ )
69	75	for key, value in priority_list:
70	76	if value is not None:
71	77	monkeypatch.setenv(key, value)
...	...	@@ -81,7 +87,6 @@ class Test001ExporterUtils:
81	87	)
82	88	def test_210_get_vault_path(
83	89	self,
84		- monkeypatch: pytest.MonkeyPatch,
85	90	expected: pathlib.Path,
86	91	path: str \| os.PathLike[str] \| None,
87	92	) -> None:
...	...	@@ -91,9 +96,16 @@ class Test001ExporterUtils:
91	96
92	97	"""
93	98	runner = click.testing.CliRunner(mix_stderr=False)
94		- with tests.isolated_vault_exporter_config(
	99	+ # TODO(the-13th-letter): Rewrite using parenthesized
	100	+ # with-statements.
	101	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	102	+ with contextlib.ExitStack() as stack:
	103	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	104	+ stack.enter_context(
	105	+ tests.isolated_vault_exporter_config(
95	106	monkeypatch=monkeypatch, runner=runner
96		- ):
	107	+ )
	108	+ )
97	109	if path:
98	110	monkeypatch.setenv(
99	111	'VAULT_PATH', os.fspath(path) if path is not None else None
...	...	@@ -103,9 +115,7 @@ class Test001ExporterUtils:
103	115	== expected.expanduser().resolve()
104	116	)
105	117
106		- def test_220_register_export_vault_config_data_handler(
107		- self, monkeypatch: pytest.MonkeyPatch
108		- ) -> None:
	118	+ def test_220_register_export_vault_config_data_handler(self) -> None:
109	119	"""Register vault config data export handlers."""
110	120
111	121	def handler( # pragma: no cover
...	...	@@ -117,6 +127,7 @@ class Test001ExporterUtils:
117	127	del path, key
118	128	raise ValueError(format)
119	129
	130	+ with pytest.MonkeyPatch.context() as monkeypatch:
120	131	registry = {'dummy': handler}
121	132	monkeypatch.setattr(
122	133	exporter, '_export_vault_config_data_registry', registry
...	...	@@ -132,10 +143,9 @@ class Test001ExporterUtils:
132	143	'name2': handler,
133	144	}
134	145
135		- def test_300_get_vault_key_without_envs(
136		- self, monkeypatch: pytest.MonkeyPatch
137		- ) -> None:
	146	+ def test_300_get_vault_key_without_envs(self) -> None:
138	147	"""Fail to look up the vault key in the empty environment."""
	148	+ with pytest.MonkeyPatch.context() as monkeypatch:
139	149	monkeypatch.delenv('VAULT_KEY', raising=False)
140	150	monkeypatch.delenv('LOGNAME', raising=False)
141	151	monkeypatch.delenv('USER', raising=False)
...	...	@@ -143,14 +153,13 @@ class Test001ExporterUtils:
143	153	with pytest.raises(KeyError, match='VAULT_KEY'):
144	154	exporter.get_vault_key()
145	155
146		- def test_310_get_vault_path_without_home(
147		- self, monkeypatch: pytest.MonkeyPatch
148		- ) -> None:
	156	+ def test_310_get_vault_path_without_home(self) -> None:
149	157	"""Fail to look up the vault path without `HOME`."""
150	158
151	159	def raiser(_args: Any, *_kwargs: Any) -> Any:
152	160	raise RuntimeError('Cannot determine home directory.') # noqa: EM101,TRY003
153	161
	162	+ with pytest.MonkeyPatch.context() as monkeypatch:
154	163	monkeypatch.setattr(pathlib.Path, 'expanduser', raiser)
155	164	monkeypatch.setattr(os.path, 'expanduser', raiser)
156	165	with pytest.raises(
...	...	@@ -176,7 +185,6 @@ class Test001ExporterUtils:
176	185	)
177	186	def test_320_register_export_vault_config_data_handler_errors(
178	187	self,
179		- monkeypatch: pytest.MonkeyPatch,
180	188	namelist: tuple[str, ...],
181	189	err_pat: str,
182	190	) -> None:
...	...	@@ -196,6 +204,7 @@ class Test001ExporterUtils:
196	204	del path, key
197	205	raise ValueError(format)
198	206
	207	+ with pytest.MonkeyPatch.context() as monkeypatch:
199	208	registry = {'dummy': handler}
200	209	monkeypatch.setattr(
201	210	exporter, '_export_vault_config_data_registry', registry
...	...	@@ -205,11 +214,12 @@ class Test001ExporterUtils:
205	214	handler
206	215	)
207	216
208		- def test_321_export_vault_config_data_bad_handler(
209		- self, monkeypatch: pytest.MonkeyPatch
210		- ) -> None:
	217	+ def test_321_export_vault_config_data_bad_handler(self) -> None:
211	218	"""Fail to export vault config data without known handlers."""
212		- monkeypatch.setattr(exporter, '_export_vault_config_data_registry', {})
	219	+ with pytest.MonkeyPatch.context() as monkeypatch:
	220	+ monkeypatch.setattr(
	221	+ exporter, '_export_vault_config_data_registry', {}
	222	+ )
213	223	monkeypatch.setattr(
214	224	exporter, 'find_vault_config_data_handlers', lambda: None
215	225	)
...	...	@@ -223,18 +233,22 @@ class Test001ExporterUtils:
223	233	class Test002CLI:
224	234	"""Test the command-line functionality of the `exporter` subpackage."""
225	235
226		- def test_300_invalid_format(
227		- self,
228		- monkeypatch: pytest.MonkeyPatch,
229		- ) -> None:
	236	+ def test_300_invalid_format(self) -> None:
230	237	"""Reject invalid vault configuration format names."""
231	238	runner = click.testing.CliRunner(mix_stderr=False)
232		- with tests.isolated_vault_exporter_config(
	239	+ # TODO(the-13th-letter): Rewrite using parenthesized
	240	+ # with-statements.
	241	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	242	+ with contextlib.ExitStack() as stack:
	243	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	244	+ stack.enter_context(
	245	+ tests.isolated_vault_exporter_config(
233	246	monkeypatch=monkeypatch,
234	247	runner=runner,
235	248	vault_config=tests.VAULT_V03_CONFIG,
236	249	vault_key=tests.VAULT_MASTER_KEY,
237		- ):
	250	+ )
	251	+ )
238	252	result_ = runner.invoke(
239	253	cli.derivepassphrase_export_vault,
240	254	['-f', 'INVALID', 'VAULT_PATH'],
...	...	@@ -272,7 +286,6 @@ class Test002CLI:
272	286	)
273	287	def test_999_no_cryptography_error_message(
274	288	self,
275		- monkeypatch: pytest.MonkeyPatch,
276	289	caplog: pytest.LogCaptureFixture,
277	290	format: str,
278	291	config: str \| bytes,
...	...	@@ -280,12 +293,19 @@ class Test002CLI:
280	293	) -> None:
281	294	"""Abort export call if no cryptography is available."""
282	295	runner = click.testing.CliRunner(mix_stderr=False)
283		- with tests.isolated_vault_exporter_config(
	296	+ # TODO(the-13th-letter): Rewrite using parenthesized
	297	+ # with-statements.
	298	+ # https://the13thletter.info/derivepassphrase/latest/pycompatibility/#after-eol-py3.9
	299	+ with contextlib.ExitStack() as stack:
	300	+ monkeypatch = stack.enter_context(pytest.MonkeyPatch.context())
	301	+ stack.enter_context(
	302	+ tests.isolated_vault_exporter_config(
284	303	monkeypatch=monkeypatch,
285	304	runner=runner,
286	305	vault_config=config,
287	306	vault_key=key,
288		- ):
	307	+ )
	308	+ )
289	309	result_ = runner.invoke(
290	310	cli.derivepassphrase_export_vault,
291	311	['-f', format, 'VAULT_PATH'],

...	...	@@ -132,11 +132,11 @@ class TestStaticFunctionality:
132	132
133	133	def test_200_constructor_no_running_agent(
134	134	self,
135		- monkeypatch: pytest.MonkeyPatch,
136	135	skip_if_no_af_unix_support: None,
137	136	) -> None:
138	137	"""Abort if the running agent cannot be located."""
139	138	del skip_if_no_af_unix_support
	139	+ with pytest.MonkeyPatch.context() as monkeypatch:
140	140	monkeypatch.delenv('SSH_AUTH_SOCK', raising=False)
141	141	with pytest.raises(
142	142	KeyError, match='SSH_AUTH_SOCK environment variable'
...	...	@@ -467,26 +467,20 @@ class TestAgentInteraction:
467	467
468	468	def test_300_constructor_bad_running_agent(
469	469	self,
470		- monkeypatch: pytest.MonkeyPatch,
471	470	running_ssh_agent: tests.RunningSSHAgentInfo,
472	471	) -> None:
473	472	"""Fail if the agent address is invalid."""
474		- with monkeypatch.context() as monkeypatch2:
475		- monkeypatch2.setenv(
476		- 'SSH_AUTH_SOCK', running_ssh_agent.socket + '~'
477		- )
	473	+ with pytest.MonkeyPatch.context() as monkeypatch:
	474	+ monkeypatch.setenv('SSH_AUTH_SOCK', running_ssh_agent.socket + '~')
478	475	sock = socket.socket(family=socket.AF_UNIX)
479	476	with pytest.raises(OSError): # noqa: PT011
480	477	ssh_agent.SSHAgentClient(socket=sock)
481	478
482		- def test_301_constructor_no_af_unix_support(
483		- self,
484		- monkeypatch: pytest.MonkeyPatch,
485		- ) -> None:
	479	+ def test_301_constructor_no_af_unix_support(self) -> None:
486	480	"""Fail without [`socket.AF_UNIX`][] support."""
487		- with monkeypatch.context() as monkeypatch2:
488		- monkeypatch2.setenv('SSH_AUTH_SOCK', "the value doesn't matter")
489		- monkeypatch2.delattr(socket, 'AF_UNIX', raising=False)
	481	+ with pytest.MonkeyPatch.context() as monkeypatch:
	482	+ monkeypatch.setenv('SSH_AUTH_SOCK', "the value doesn't matter")
	483	+ monkeypatch.delattr(socket, 'AF_UNIX', raising=False)
490	484	with pytest.raises(
491	485	NotImplementedError,
492	486	match='UNIX domain sockets',
...	...	@@ -503,7 +497,6 @@ class TestAgentInteraction:
503	497	)
504	498	def test_310_truncated_server_response(
505	499	self,
506		- monkeypatch: pytest.MonkeyPatch,
507	500	running_ssh_agent: tests.RunningSSHAgentInfo,
508	501	response: bytes,
509	502	) -> None:
...	...	@@ -520,6 +513,7 @@ class TestAgentInteraction:
520	513	return response_stream.read(args, *kwargs)
521	514
522	515	pseudo_socket = PseudoSocket()
	516	+ with pytest.MonkeyPatch.context() as monkeypatch:
523	517	monkeypatch.setattr(client, '_connection', pseudo_socket)
524	518	with pytest.raises(EOFError):
525	519	client.request(255, b'')
...	...	@@ -552,7 +546,6 @@ class TestAgentInteraction:
552	546	)
553	547	def test_320_list_keys_error_responses(
554	548	self,
555		- monkeypatch: pytest.MonkeyPatch,
556	549	running_ssh_agent: tests.RunningSSHAgentInfo,
557	550	response_code: _types.SSH_AGENT,
558	551	response: bytes \| bytearray,
...	...	@@ -602,9 +595,9 @@ class TestAgentInteraction:
602	595	)
603	596	return response
604	597
605		- with monkeypatch.context() as monkeypatch2:
	598	+ with pytest.MonkeyPatch.context() as monkeypatch:
606	599	client = ssh_agent.SSHAgentClient()
607		- monkeypatch2.setattr(client, 'request', request)
	600	+ monkeypatch.setattr(client, 'request', request)
608	601	with pytest.raises(exc_type, match=exc_pattern):
609	602	client.list_keys()
610	603
...	...	@@ -640,7 +633,6 @@ class TestAgentInteraction:
640	633	)
641	634	def test_330_sign_error_responses(
642	635	self,
643		- monkeypatch: pytest.MonkeyPatch,
644	636	running_ssh_agent: tests.RunningSSHAgentInfo,
645	637	key: bytes \| bytearray,
646	638	check: bool,
...	...	@@ -692,16 +684,16 @@ class TestAgentInteraction:
692	684	)
693	685	return response # pragma: no cover
694	686
695		- with monkeypatch.context() as monkeypatch2:
	687	+ with pytest.MonkeyPatch.context() as monkeypatch:
696	688	client = ssh_agent.SSHAgentClient()
697		- monkeypatch2.setattr(client, 'request', request)
	689	+ monkeypatch.setattr(client, 'request', request)
698	690	Pair = _types.SSHKeyCommentPair # noqa: N806
699	691	com = b'no comment'
700	692	loaded_keys = [
701	693	Pair(v.public_key_data, com).toreadonly()
702	694	for v in tests.SUPPORTED_KEYS.values()
703	695	]
704		- monkeypatch2.setattr(client, 'list_keys', lambda: loaded_keys)
	696	+ monkeypatch.setattr(client, 'list_keys', lambda: loaded_keys)
705	697	with pytest.raises(exc_type, match=exc_pattern):
706	698	client.sign(key, b'abc', check_if_key_loaded=check)
707	699
708	700