derivepassphrase.git

@@ -196,8 +196,13 @@ for opt, config in SINGLES.items():

 class TestCLI:

-    def test_200_help_output(self) -> None:

+    def test_200_help_output(self, monkeypatch: Any) -> None:

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

+        with tests.isolated_config(

+            monkeypatch=monkeypatch,

+            runner=runner,

+            config={'services': {}},

+        ):

             result = runner.invoke(

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

             )

@@ -219,6 +224,11 @@ class TestCLI:

         option = f'--{charset_name}'

         charset = dpp.Vault._CHARSETS[charset_name].decode('ascii')

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

+        with tests.isolated_config(

+            monkeypatch=monkeypatch,

+            runner=runner,

+            config={'services': {}},

+        ):

             result = runner.invoke(

                 cli.derivepassphrase,

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

@@ -240,6 +250,11 @@ class TestCLI:

     def test_202_disable_repetition(self, monkeypatch: Any) -> None:

         monkeypatch.setattr(cli, '_prompt_for_passphrase', tests.auto_prompt)

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

+        with tests.isolated_config(

+            monkeypatch=monkeypatch,

+            runner=runner,

+            config={'services': {}},

+        ):

             result = runner.invoke(

                 cli.derivepassphrase,

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

@@ -388,8 +403,15 @@ class TestCLI:

             '--length',

         ],

     )

-    def test_210_invalid_argument_range(self, option: str) -> None:

+    def test_210_invalid_argument_range(

+        self, monkeypatch: Any, option: str

+    ) -> None:

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

+        with tests.isolated_config(

+            monkeypatch=monkeypatch,

+            runner=runner,

+            config={'services': {}},

+        ):

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

                 result = runner.invoke(

                     cli.derivepassphrase,

@@ -482,10 +504,16 @@ class TestCLI:

     )

     def test_212_incompatible_options(

         self,

+        monkeypatch: Any,

         options: list[str],

         service: bool | None,

     ) -> None:

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

+        with tests.isolated_config(

+            monkeypatch=monkeypatch,

+            runner=runner,

+            config={'services': {}},

+        ):

             result = runner.invoke(

                 cli.derivepassphrase,

                 [*options, DUMMY_SERVICE] if service else options,

@@ -886,8 +914,13 @@ contents go here

                 custom_error.encode() in result.stderr_bytes

             ), 'expected error message missing'

-    def test_226_no_arguments(self) -> None:

+    def test_226_no_arguments(self, monkeypatch: Any) -> None:

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

+        with tests.isolated_config(

+            monkeypatch=monkeypatch,

+            runner=runner,

+            config={'services': {}},

+        ):

             result = runner.invoke(

                 cli.derivepassphrase, [], catch_exceptions=False

             )

@@ -897,8 +930,13 @@ contents go here

             b'SERVICE is required' in result.stderr_bytes

         ), 'expected error message missing'

-    def test_226a_no_passphrase_or_key(self) -> None:

+    def test_226a_no_passphrase_or_key(self, monkeypatch: Any) -> None:

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

+        with tests.isolated_config(

+            monkeypatch=monkeypatch,

+            runner=runner,

+            config={'services': {}},

+        ):

             result = runner.invoke(

                 cli.derivepassphrase, [DUMMY_SERVICE], catch_exceptions=False

             )

@@ -0,0 +1 @@

+Isolate the tests properly and consistently from the user's configuration, so that user configuration problems do not cause unrelated test failures.