derivepassphrase.git

@@ -17,6 +17,7 @@ import re

 import shlex

 import stat

 import tempfile

+import types

 import zipfile

 from typing import TYPE_CHECKING

@@ -2117,3 +2118,29 @@ deprecation_info_emitted = message_emitted_factory(

     logging.INFO, logger_name=f'{cli.PROG_NAME}.deprecation'

 )

 error_emitted = message_emitted_factory(logging.ERROR)

+

+

+class Parametrize(types.SimpleNamespace):

+    VAULT_CONFIG_FORMATS_DATA = pytest.mark.parametrize(

+        ['config', 'format', 'config_data'],

+        [

+            pytest.param(

+                VAULT_V02_CONFIG,

+                'v0.2',

+                VAULT_V02_CONFIG_DATA,

+                id='0.2',

+            ),

+            pytest.param(

+                VAULT_V03_CONFIG,

+                'v0.3',

+                VAULT_V03_CONFIG_DATA,

+                id='0.3',

+            ),

+            pytest.param(

+                VAULT_STOREROOM_CONFIG_ZIPPED,

+                'storeroom',

+                VAULT_STOREROOM_CONFIG_DATA,

+                id='storeroom',

+            ),

+        ],

+    )

@@ -7,7 +7,6 @@ from __future__ import annotations

 import base64

 import contextlib

 import copy

-import enum

 import errno

 import io

 import json

@@ -18,6 +17,7 @@ import shlex

 import shutil

 import socket

 import textwrap

+import types

 import warnings

 from typing import TYPE_CHECKING

@@ -346,7 +346,7 @@ def zsh_format(item: click.shell_completion.CompletionItem) -> str:

     return f'{item.type}\n{value}\n{help_}'

-class Parametrizations(enum.Enum):

+class Parametrize(types.SimpleNamespace):

     EAGER_ARGUMENTS = pytest.mark.parametrize(

         'arguments',

         [['--help'], ['--version']],

@@ -1438,8 +1438,8 @@ class TestAllCLI:

             empty_stderr=True, output='Use $VISUAL or $EDITOR to configure'

         ), 'expected clean exit, and option group epilog in help text'

-    @Parametrizations.COMMAND_NON_EAGER_ARGUMENTS.value

-    @Parametrizations.EAGER_ARGUMENTS.value

+    @Parametrize.COMMAND_NON_EAGER_ARGUMENTS

+    @Parametrize.EAGER_ARGUMENTS

     def test_200_eager_options(

         self,

         command: list[str],

@@ -1467,10 +1467,10 @@ class TestAllCLI:

             result = tests.ReadableResult.parse(result_)

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

-    @Parametrizations.NO_COLOR.value

-    @Parametrizations.FORCE_COLOR.value

-    @Parametrizations.ISATTY.value

-    @Parametrizations.COLORFUL_COMMAND_INPUT.value

+    @Parametrize.NO_COLOR

+    @Parametrize.FORCE_COLOR

+    @Parametrize.ISATTY

+    @Parametrize.COLORFUL_COMMAND_INPUT

     def test_201_no_color_force_color(

         self,

         no_color: bool,

@@ -1578,7 +1578,7 @@ class TestCLI:

             'expected clean exit, and version in help text'

         )

-    @Parametrizations.CHARSET_NAME.value

+    @Parametrize.CHARSET_NAME

     def test_201_disable_character_set(

         self,

         charset_name: str,

@@ -1650,7 +1650,7 @@ class TestCLI:

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

             )

-    @Parametrizations.CONFIG_WITH_KEY.value

+    @Parametrize.CONFIG_WITH_KEY

     def test_204a_key_from_config(

         self,

         config: _types.VaultConfig,

@@ -1731,8 +1731,8 @@ class TestCLI:

             'expected known output'

         )

-    @Parametrizations.BASE_CONFIG_WITH_KEY_VARIATIONS.value

-    @Parametrizations.KEY_INDEX.value

+    @Parametrize.BASE_CONFIG_WITH_KEY_VARIATIONS

+    @Parametrize.KEY_INDEX

     def test_204c_key_override_on_command_line(

         self,

         running_ssh_agent: tests.RunningSSHAgentInfo,

@@ -1818,7 +1818,7 @@ class TestCLI:

             'expected known output'

         )

-    @Parametrizations.KEY_OVERRIDING_IN_CONFIG.value

+    @Parametrize.KEY_OVERRIDING_IN_CONFIG

     def test_206_setting_phrase_thus_overriding_key_in_config(

         self,

         running_ssh_agent: tests.RunningSSHAgentInfo,

@@ -1869,7 +1869,7 @@ class TestCLI:

             map(is_harmless_config_import_warning, caplog.record_tuples)

         ), 'unexpected error output'

-    @Parametrizations.VAULT_CHARSET_OPTION.value

+    @Parametrize.VAULT_CHARSET_OPTION

     def test_210_invalid_argument_range(

         self,

         option: str,

@@ -1899,7 +1899,7 @@ class TestCLI:

                     'expected error exit and known error message'

                 )

-    @Parametrizations.OPTION_COMBINATIONS_SERVICE_NEEDED.value

+    @Parametrize.OPTION_COMBINATIONS_SERVICE_NEEDED

     def test_211_service_needed(

         self,

         options: list[str],

@@ -2038,7 +2038,7 @@ class TestCLI:

                 'services': {'': {'length': 40}},

             }, 'requested configuration change was not applied'

-    @Parametrizations.OPTION_COMBINATIONS_INCOMPATIBLE.value

+    @Parametrize.OPTION_COMBINATIONS_INCOMPATIBLE

     def test_212_incompatible_options(

         self,

         options: list[str],

@@ -2068,7 +2068,7 @@ class TestCLI:

             'expected error exit and known error message'

         )

-    @Parametrizations.VALID_TEST_CONFIGS.value

+    @Parametrize.VALID_TEST_CONFIGS

     def test_213_import_config_success(

         self,

         caplog: pytest.LogCaptureFixture,

@@ -2253,7 +2253,7 @@ class TestCLI:

             'expected error exit and known error message'

         )

-    @Parametrizations.EXPORT_FORMAT_OPTIONS.value

+    @Parametrize.EXPORT_FORMAT_OPTIONS

     def test_214_export_settings_no_stored_settings(

         self,

         export_options: list[str],

@@ -2286,7 +2286,7 @@ class TestCLI:

         result = tests.ReadableResult.parse(result_)

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

-    @Parametrizations.EXPORT_FORMAT_OPTIONS.value

+    @Parametrize.EXPORT_FORMAT_OPTIONS

     def test_214a_export_settings_bad_stored_config(

         self,

         export_options: list[str],

@@ -2316,7 +2316,7 @@ class TestCLI:

             'expected error exit and known error message'

         )

-    @Parametrizations.EXPORT_FORMAT_OPTIONS.value

+    @Parametrize.EXPORT_FORMAT_OPTIONS

     def test_214b_export_settings_not_a_file(

         self,

         export_options: list[str],

@@ -2348,7 +2348,7 @@ class TestCLI:

             'expected error exit and known error message'

         )

-    @Parametrizations.EXPORT_FORMAT_OPTIONS.value

+    @Parametrize.EXPORT_FORMAT_OPTIONS

     def test_214c_export_settings_target_not_a_file(

         self,

         export_options: list[str],

@@ -2378,7 +2378,7 @@ class TestCLI:

             'expected error exit and known error message'

         )

-    @Parametrizations.EXPORT_FORMAT_OPTIONS.value

+    @Parametrize.EXPORT_FORMAT_OPTIONS

     def test_214d_export_settings_settings_directory_not_a_directory(

         self,

         export_options: list[str],

@@ -2556,7 +2556,7 @@ contents go here

                 config = json.load(infile)

             assert config == {'global': {'phrase': 'abc'}, 'services': {}}

-    @Parametrizations.CONFIG_EDITING_VIA_CONFIG_FLAG.value

+    @Parametrize.CONFIG_EDITING_VIA_CONFIG_FLAG

     def test_224_store_config_good(

         self,

         command_line: list[str],

@@ -2596,7 +2596,7 @@ contents go here

                 'stored config does not match expectation'

             )

-    @Parametrizations.CONFIG_EDITING_VIA_CONFIG_FLAG_FAILURES.value

+    @Parametrize.CONFIG_EDITING_VIA_CONFIG_FLAG_FAILURES

     def test_225_store_config_fail(

         self,

         command_line: list[str],

@@ -2723,7 +2723,7 @@ contents go here

             'expected error exit and known error message'

         )

-    @Parametrizations.TRY_RACE_FREE_IMPLEMENTATION.value

+    @Parametrize.TRY_RACE_FREE_IMPLEMENTATION

     def test_225d_store_config_fail_manual_read_only_file(

         self,

         try_race_free_implementation: bool,

@@ -3105,7 +3105,7 @@ contents go here

                 'expected error exit and known error message'

             )

-    @Parametrizations.UNICODE_NORMALIZATION_WARNING_INPUTS.value

+    @Parametrize.UNICODE_NORMALIZATION_WARNING_INPUTS

     def test_300_unicode_normalization_form_warning(

         self,

         caplog: pytest.LogCaptureFixture,

@@ -3145,7 +3145,7 @@ contents go here

             'expected known warning message in stderr'

         )

-    @Parametrizations.UNICODE_NORMALIZATION_ERROR_INPUTS.value

+    @Parametrize.UNICODE_NORMALIZATION_ERROR_INPUTS

     def test_301_unicode_normalization_form_error(

         self,

         main_config: str,

@@ -3186,7 +3186,7 @@ contents go here

             'expected error exit and known error message'

         )

-    @Parametrizations.UNICODE_NORMALIZATION_COMMAND_LINES.value

+    @Parametrize.UNICODE_NORMALIZATION_COMMAND_LINES

     def test_301a_unicode_normalization_form_error_from_stored_config(

         self,

         command_line: list[str],

@@ -3293,7 +3293,7 @@ contents go here

 class TestCLIUtils:

     """Tests for command-line utility functions."""

-    @Parametrizations.BASE_CONFIG_VARIATIONS.value

+    @Parametrize.BASE_CONFIG_VARIATIONS

     def test_100_load_config(

         self,

         config: Any,

@@ -3855,7 +3855,7 @@ Boo.

         assert _types.is_vault_config(config)

         return self.export_as_sh_helper(config)

-    @Parametrizations.DELETE_CONFIG_INPUT.value

+    @Parametrize.DELETE_CONFIG_INPUT

     def test_203_repeated_config_deletion(

         self,

         command_line: list[str],

@@ -3901,7 +3901,7 @@ Boo.

             == DUMMY_RESULT_KEY1

         )

-    @Parametrizations.VALIDATION_FUNCTION_INPUT.value

+    @Parametrize.VALIDATION_FUNCTION_INPUT

     def test_210a_validate_constraints_manually(

         self,

         vfunc: Callable[[click.Context, click.Parameter, Any], int | None],

@@ -3912,7 +3912,7 @@ Boo.

         param = cli.derivepassphrase_vault.params[0]

         assert vfunc(ctx, param, input) == input

-    @Parametrizations.CONNECTION_HINTS.value

+    @Parametrize.CONNECTION_HINTS

     def test_227_get_suitable_ssh_keys(

         self,

         running_ssh_agent: tests.RunningSSHAgentInfo,

@@ -4043,7 +4043,7 @@ Boo.

 class TestCLITransition:

     """Transition tests for the command-line interface up to v1.0."""

-    @Parametrizations.BASE_CONFIG_VARIATIONS.value

+    @Parametrize.BASE_CONFIG_VARIATIONS

     def test_110_load_config_backup(

         self,

         config: Any,

@@ -4066,7 +4066,7 @@ class TestCLITransition:

             ).write_text(json.dumps(config, indent=2) + '\n', encoding='UTF-8')

             assert cli_helpers.migrate_and_load_old_config()[0] == config

-    @Parametrizations.BASE_CONFIG_VARIATIONS.value

+    @Parametrize.BASE_CONFIG_VARIATIONS

     def test_111_migrate_config(

         self,

         config: Any,

@@ -4089,7 +4089,7 @@ class TestCLITransition:

             ).write_text(json.dumps(config, indent=2) + '\n', encoding='UTF-8')

             assert cli_helpers.migrate_and_load_old_config() == (config, None)

-    @Parametrizations.BASE_CONFIG_VARIATIONS.value

+    @Parametrize.BASE_CONFIG_VARIATIONS

     def test_112_migrate_config_error(

         self,

         config: Any,

@@ -4118,7 +4118,7 @@ class TestCLITransition:

             assert isinstance(err, OSError)

             assert err.errno == errno.EISDIR

-    @Parametrizations.BAD_CONFIGS.value

+    @Parametrize.BAD_CONFIGS

     def test_113_migrate_config_error_bad_config_value(

         self,

         config: Any,

@@ -4212,7 +4212,7 @@ class TestCLITransition:

             'expected error exit and known error type'

         )

-    @Parametrizations.CHARSET_NAME.value

+    @Parametrize.CHARSET_NAME

     def test_210_forward_vault_disable_character_set(

         self,

         caplog: pytest.LogCaptureFixture,

@@ -4977,7 +4977,7 @@ class TestShellCompletion:

             """Return the completion items' values, as a sequence."""

             return tuple(c.value for c in self())

-    @Parametrizations.COMPLETABLE_ITEMS.value

+    @Parametrize.COMPLETABLE_ITEMS

     def test_100_is_completable_item(

         self,

         partial: str,

@@ -4986,7 +4986,7 @@ class TestShellCompletion:

         """Our `_is_completable_item` predicate for service names works."""

         assert cli_helpers.is_completable_item(partial) == is_completable

-    @Parametrizations.COMPLETABLE_OPTIONS.value

+    @Parametrize.COMPLETABLE_OPTIONS

     def test_200_options(

         self,

         command_prefix: Sequence[str],

@@ -4997,7 +4997,7 @@ class TestShellCompletion:

         comp = self.Completions(command_prefix, incomplete)

         assert frozenset(comp.get_words()) == completions

-    @Parametrizations.COMPLETABLE_SUBCOMMANDS.value

+    @Parametrize.COMPLETABLE_SUBCOMMANDS

     def test_201_subcommands(

         self,

         command_prefix: Sequence[str],

@@ -5008,8 +5008,8 @@ class TestShellCompletion:

         comp = self.Completions(command_prefix, incomplete)

         assert frozenset(comp.get_words()) == completions

-    @Parametrizations.COMPLETABLE_PATH_ARGUMENT.value

-    @Parametrizations.INCOMPLETE.value

+    @Parametrize.COMPLETABLE_PATH_ARGUMENT

+    @Parametrize.INCOMPLETE

     def test_202_paths(

         self,

         command_prefix: Sequence[str],

@@ -5023,7 +5023,7 @@ class TestShellCompletion:

             frozenset((x.type, x.value, x.help) for x in comp()) == completions

         )

-    @Parametrizations.COMPLETABLE_SERVICE_NAMES.value

+    @Parametrize.COMPLETABLE_SERVICE_NAMES

     def test_203_service_names(

         self,

         config: _types.VaultConfig,

@@ -5047,8 +5047,8 @@ class TestShellCompletion:

             comp = self.Completions(['vault'], incomplete)

             assert frozenset(comp.get_words()) == completions

-    @Parametrizations.SHELL_FORMATTER.value

-    @Parametrizations.COMPLETION_FUNCTION_INPUTS.value

+    @Parametrize.SHELL_FORMATTER

+    @Parametrize.COMPLETION_FUNCTION_INPUTS

     def test_300_shell_completion_formatting(

         self,

         shell: str,

@@ -5112,8 +5112,8 @@ class TestShellCompletion:

             assert actual_items == expected_items

             assert actual_string == expected_string

-    @Parametrizations.CONFIG_SETTING_MODE.value

-    @Parametrizations.SERVICE_NAME_COMPLETION_INPUTS.value

+    @Parametrize.CONFIG_SETTING_MODE

+    @Parametrize.SERVICE_NAME_COMPLETION_INPUTS

     def test_400_incompletable_service_names(

         self,

         caplog: pytest.LogCaptureFixture,

@@ -5191,7 +5191,7 @@ class TestShellCompletion:

                 '',

             )

-    @Parametrizations.SERVICE_NAME_EXCEPTIONS.value

+    @Parametrize.SERVICE_NAME_EXCEPTIONS

     def test_410b_service_name_exceptions_custom_error(

         self,

         exc_type: type[Exception],

@@ -6,9 +6,9 @@ from __future__ import annotations

 import base64

 import contextlib

-import enum

 import json

 import pathlib

+import types

 from typing import TYPE_CHECKING

 import click.testing

@@ -40,7 +40,7 @@ if TYPE_CHECKING:

     from typing_extensions import Buffer, Literal

-class Parametrizations(enum.Enum):

+class Parametrize(types.SimpleNamespace):

     BAD_CONFIG = pytest.mark.parametrize(

         'config', ['xxx', 'null', '{"version": 255}']

     )

@@ -94,32 +94,6 @@ class Parametrizations(enum.Enum):

             ),

         ],

     )

-    # TODO(the-13th-letter): Consolidate with

-    # test_derivepassphrase_exporter.Parametrizations.VAULT_CONFIG_FORMATS_DATA.

-    # TODO(the-13th-letter): Reorder as "config", "format", "config_data".

-    VAULT_CONFIG_FORMATS_DATA = pytest.mark.parametrize(

-        ['format', 'config', 'config_data'],

-        [

-            pytest.param(

-                'v0.2',

-                tests.VAULT_V02_CONFIG,

-                tests.VAULT_V02_CONFIG_DATA,

-                id='0.2',

-            ),

-            pytest.param(

-                'v0.3',

-                tests.VAULT_V03_CONFIG,

-                tests.VAULT_V03_CONFIG_DATA,

-                id='0.3',

-            ),

-            pytest.param(

-                'storeroom',

-                tests.VAULT_STOREROOM_CONFIG_ZIPPED,

-                tests.VAULT_STOREROOM_CONFIG_DATA,

-                id='storeroom',

-            ),

-        ],

-    )

     STOREROOM_HANDLER = pytest.mark.parametrize(

         'handler',

         [

@@ -261,7 +235,7 @@ class TestCLI:

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

         assert json.loads(result.output) == tests.VAULT_V03_CONFIG_DATA

-    @Parametrizations.VAULT_CONFIG_FORMATS_DATA.value

+    @tests.Parametrize.VAULT_CONFIG_FORMATS_DATA

     def test_210_load_vault_v02_v03_storeroom(

         self,

         format: str,

@@ -467,9 +441,9 @@ class TestCLI:

 class TestStoreroom:

     """Test the "storeroom" handler and handler machinery."""

-    @Parametrizations.PATH.value

-    @Parametrizations.KEY_FORMATS.value

-    @Parametrizations.STOREROOM_HANDLER.value

+    @Parametrize.PATH

+    @Parametrize.KEY_FORMATS

+    @Parametrize.STOREROOM_HANDLER

     def test_200_export_data_path_and_keys_type(

         self,

         path: str | None,

@@ -514,7 +488,7 @@ class TestStoreroom:

         with pytest.raises(ValueError, match='Cannot handle version 255'):

             storeroom._decrypt_bucket_item(bucket_item, master_keys)

-    @Parametrizations.BAD_CONFIG.value

+    @Parametrize.BAD_CONFIG

     def test_401_decrypt_bucket_file_bad_json_or_version(

         self,

         config: str,

@@ -549,8 +523,8 @@ class TestStoreroom:

             with pytest.raises(ValueError, match='Invalid bucket file: '):

                 list(storeroom._decrypt_bucket_file(p, master_keys))

-    @Parametrizations.BAD_MASTER_KEYS_DATA.value

-    @Parametrizations.STOREROOM_HANDLER.value

+    @Parametrize.BAD_MASTER_KEYS_DATA

+    @Parametrize.STOREROOM_HANDLER

     def test_402_export_storeroom_data_bad_master_keys_file(

         self,

         data: str,

@@ -582,8 +556,8 @@ class TestStoreroom:

             with pytest.raises(RuntimeError, match=err_msg):

                 handler(format='storeroom')

-    @Parametrizations.BAD_STOREROOM_CONFIG_DATA.value

-    @Parametrizations.STOREROOM_HANDLER.value

+    @Parametrize.BAD_STOREROOM_CONFIG_DATA

+    @Parametrize.STOREROOM_HANDLER

     def test_403_export_storeroom_data_bad_directory_listing(

         self,

         zipped_config: bytes,

@@ -701,7 +675,7 @@ class TestStoreroom:

 class TestVaultNativeConfig:

     """Test the vault-native handler and handler machinery."""

-    @Parametrizations.VAULT_NATIVE_PBKDF2_RESULT.value

+    @Parametrize.VAULT_NATIVE_PBKDF2_RESULT

     def test_200_pbkdf2_manually(self, iterations: int, result: bytes) -> None:

         """The PBKDF2 helper function works."""

         assert (

@@ -711,8 +685,8 @@ class TestVaultNativeConfig:

             == result

         )

-    @Parametrizations.VAULT_NATIVE_CONFIG_DATA.value

-    @Parametrizations.VAULT_NATIVE_HANDLER.value

+    @Parametrize.VAULT_NATIVE_CONFIG_DATA

+    @Parametrize.VAULT_NATIVE_HANDLER

     def test_201_export_vault_native_data_explicit_version(

         self,

         config: str,

@@ -751,9 +725,9 @@ class TestVaultNativeConfig:

                 parsed_config = handler(None, format=format)

                 assert parsed_config == result

-    @Parametrizations.PATH.value

-    @Parametrizations.KEY_FORMATS.value

-    @Parametrizations.VAULT_NATIVE_HANDLER.value

+    @Parametrize.PATH

+    @Parametrize.KEY_FORMATS

+    @Parametrize.VAULT_NATIVE_HANDLER

     def test_202_export_data_path_and_keys_type(

         self,

         path: str | None,

@@ -785,7 +759,7 @@ class TestVaultNativeConfig:

                 == tests.VAULT_V03_CONFIG_DATA

             )

-    @Parametrizations.VAULT_NATIVE_PARSER_CLASS_DATA.value

+    @Parametrize.VAULT_NATIVE_PARSER_CLASS_DATA

     def test_300_result_caching(

         self,

         parser_class: type[vault_native.VaultNativeConfigParser],

@@ -5,11 +5,11 @@

 from __future__ import annotations

 import contextlib

-import enum

 import operator

 import os

 import pathlib

 import string

+import types

 from typing import TYPE_CHECKING, Any, NamedTuple

 import click.testing

@@ -24,7 +24,7 @@ if TYPE_CHECKING:

     from typing_extensions import Buffer

-class Parametrizations(enum.Enum):

+class Parametrize(types.SimpleNamespace):

     EXPECTED_VAULT_PATH = pytest.mark.parametrize(

         ['expected', 'path'],

         [

@@ -33,32 +33,6 @@ class Parametrizations(enum.Enum):

             (pathlib.Path('~/.vault'), None),

         ],

     )

-    # TODO(the-13th-letter): Consolidate with

-    # test_derivepassphrase_cli_export_vault.Parametrizations.VAULT_CONFIG_FORMATS_DATA.

-    # TODO(the-13th-letter): Reorder as "config", "format", "config_data".

-    VAULT_CONFIG_FORMATS_DATA = pytest.mark.parametrize(

-        ['format', 'config', 'config_data'],

-        [

-            pytest.param(

-                'v0.2',

-                tests.VAULT_V02_CONFIG,

-                tests.VAULT_V02_CONFIG_DATA,

-                id='0.2',

-            ),

-            pytest.param(

-                'v0.3',

-                tests.VAULT_V03_CONFIG,

-                tests.VAULT_V03_CONFIG_DATA,

-                id='0.3',

-            ),

-            pytest.param(

-                'storeroom',

-                tests.VAULT_STOREROOM_CONFIG_ZIPPED,

-                tests.VAULT_STOREROOM_CONFIG_DATA,

-                id='storeroom',

-            ),

-        ],

-    )

     EXPORT_VAULT_CONFIG_DATA_HANDLER_NAMELISTS = pytest.mark.parametrize(

         ['namelist', 'err_pat'],

         [

@@ -248,7 +222,7 @@ class Test001ExporterUtils:

                     monkeypatch.setenv(key, value)

             assert os.fsdecode(exporter.get_vault_key()) == expected

-    @Parametrizations.EXPECTED_VAULT_PATH.value

+    @Parametrize.EXPECTED_VAULT_PATH

     def test_210_get_vault_path(

         self,

         expected: pathlib.Path,

@@ -351,7 +325,7 @@ class Test001ExporterUtils:

             ):

                 exporter.get_vault_path()

-    @Parametrizations.EXPORT_VAULT_CONFIG_DATA_HANDLER_NAMELISTS.value

+    @Parametrize.EXPORT_VAULT_CONFIG_DATA_HANDLER_NAMELISTS

     def test_320_register_export_vault_config_data_handler_errors(

         self,

         namelist: tuple[str, ...],

@@ -430,15 +404,16 @@ class Test002CLI:

             )

     @tests.skip_if_cryptography_support

-    @Parametrizations.VAULT_CONFIG_FORMATS_DATA.value

+    @tests.Parametrize.VAULT_CONFIG_FORMATS_DATA

     def test_999_no_cryptography_error_message(

         self,

         caplog: pytest.LogCaptureFixture,

-        format: str,

         config: str | bytes,

-        key: str,

+        format: str,

+        config_data: str,

     ) -> None:

         """Abort export call if no cryptography is available."""

+        del config_data

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

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

         # with-statements.

@@ -450,7 +425,7 @@ class Test002CLI:

                     monkeypatch=monkeypatch,

                     runner=runner,

                     vault_config=config,

-                    vault_key=key,

+                    vault_key=tests.VAULT_MASTER_KEY,

                 )

             )

             result_ = runner.invoke(

@@ -8,10 +8,10 @@ from __future__ import annotations

 import collections

 import contextlib

-import enum

 import functools

 import math

 import operator

+import types

 from typing import TYPE_CHECKING, NamedTuple

 import hypothesis

@@ -55,7 +55,7 @@ def bitseq(string: str) -> list[int]:

     return [int(char, 2) for char in string]

-class Parametrizations(enum.Enum):

+class Parametrize(types.SimpleNamespace):

     BIG_ENDIAN_NUMBER_EXCEPTIONS = pytest.mark.parametrize(

         ['exc_type', 'exc_pattern', 'sequence', 'base'],

         [

@@ -199,7 +199,7 @@ class TestStaticFunctionality:

             sequin.Sequin._big_endian_number(sequence, base=base)

         ) == expected

-    @Parametrizations.BIG_ENDIAN_NUMBER_EXCEPTIONS.value

+    @Parametrize.BIG_ENDIAN_NUMBER_EXCEPTIONS

     def test_300_big_endian_number_exceptions(

         self,

         exc_type: type[Exception],

@@ -541,7 +541,7 @@ class TestSequin:

                     f'After step {i}, the bit sequence is not exhausted yet'

                 )

-    @Parametrizations.INVALID_SEQUIN_INPUTS.value

+    @Parametrize.INVALID_SEQUIN_INPUTS

     def test_300_constructor_exceptions(

         self,

         sequence: list[int] | str,

@@ -8,10 +8,10 @@ from __future__ import annotations

 import base64

 import contextlib

-import enum

 import io

 import re

 import socket

+import types

 from typing import TYPE_CHECKING

 import click

@@ -30,7 +30,7 @@ if TYPE_CHECKING:

     from typing_extensions import Any, Buffer

-class Parametrizations(enum.Enum):

+class Parametrize(types.SimpleNamespace):

     SSH_STRING_EXCEPTIONS = pytest.mark.parametrize(

         ['input', 'exc_type', 'exc_pattern'],

         [

@@ -377,7 +377,7 @@ class TestStaticFunctionality:

     # It cannot provide true tamper-resistence, but probably appears to.

     # TODO(the-13th-letter): Modify parametrization to work directly on the

     # struct.

-    @Parametrizations.PUBLIC_KEY_DATA.value

+    @Parametrize.PUBLIC_KEY_DATA

     def test_100_key_decoding(

         self, public_key: bytes, public_key_data: bytes

     ) -> None:

@@ -387,7 +387,7 @@ class TestStaticFunctionality:

             "recorded public key data doesn't match"

         )

-    @Parametrizations.SH_EXPORT_LINES.value

+    @Parametrize.SH_EXPORT_LINES

     def test_190_sh_export_line_parsing(

         self, line: str, env_name: str, value: str | None

     ) -> None:

@@ -411,7 +411,7 @@ class TestStaticFunctionality:

             ):

                 ssh_agent.SSHAgentClient()

-    @Parametrizations.UINT32_INPUT.value

+    @Parametrize.UINT32_INPUT

     def test_210_uint32(self, input: int, expected: bytes | bytearray) -> None:

         """`uint32` encoding works."""

         uint32 = ssh_agent.SSHAgentClient.uint32

@@ -436,7 +436,7 @@ class TestStaticFunctionality:

             == bytestring

         )

-    @Parametrizations.SSH_STRING_INPUT.value

+    @Parametrize.SSH_STRING_INPUT

     def test_211_string(

         self, input: bytes | bytearray, expected: bytes | bytearray

     ) -> None:

@@ -455,7 +455,7 @@ class TestStaticFunctionality:

         assert int.from_bytes(res[:4], 'big', signed=False) == len(bytestring)

         assert res[4:] == bytestring

-    @Parametrizations.SSH_UNSTRING_INPUT.value

+    @Parametrize.SSH_UNSTRING_INPUT

     def test_212_unstring(

         self, input: bytes | bytearray, expected: bytes | bytearray

     ) -> None:

@@ -521,7 +521,7 @@ class TestStaticFunctionality:

                 assert canon1(canon2(encoded)) == canon1(encoded)

     # TODO(the-13th-letter): Rename "value" to "input".

-    @Parametrizations.UINT32_EXCEPTIONS.value

+    @Parametrize.UINT32_EXCEPTIONS

     def test_310_uint32_exceptions(

         self, value: int, exc_type: type[Exception], exc_pattern: str

     ) -> None:

@@ -530,7 +530,7 @@ class TestStaticFunctionality:

         with pytest.raises(exc_type, match=exc_pattern):

             uint32(value)

-    @Parametrizations.SSH_STRING_EXCEPTIONS.value

+    @Parametrize.SSH_STRING_EXCEPTIONS

     def test_311_string_exceptions(

         self, input: Any, exc_type: type[Exception], exc_pattern: str

     ) -> None:

@@ -539,7 +539,7 @@ class TestStaticFunctionality:

         with pytest.raises(exc_type, match=exc_pattern):

             string(input)

-    @Parametrizations.SSH_UNSTRING_EXCEPTIONS.value

+    @Parametrize.SSH_UNSTRING_EXCEPTIONS

     def test_312_unstring_exceptions(

         self,

         input: bytes | bytearray,

@@ -566,7 +566,7 @@ class TestAgentInteraction:

     # TODO(the-13th-letter): Convert skip into xfail, and include the

     # key type in the skip/xfail message.  This means the key type needs

     # to be passed to the test function as well.

-    @Parametrizations.SUPPORTED_SSH_TEST_KEYS.value

+    @Parametrize.SUPPORTED_SSH_TEST_KEYS

     def test_200_sign_data_via_agent(

         self,

         ssh_agent_client_with_test_keys_loaded: ssh_agent.SSHAgentClient,

@@ -604,7 +604,7 @@ class TestAgentInteraction:

     # TODO(the-13th-letter): Include the key type in the skip message.

     # This means the key type needs to be passed to the test function as

     # well.

-    @Parametrizations.UNSUITABLE_SSH_TEST_KEYS.value

+    @Parametrize.UNSUITABLE_SSH_TEST_KEYS

     def test_201_sign_data_via_agent_unsupported(

         self,

         ssh_agent_client_with_test_keys_loaded: ssh_agent.SSHAgentClient,

@@ -632,7 +632,7 @@ class TestAgentInteraction:

         with pytest.raises(ValueError, match='unsuitable SSH key'):

             vault.Vault.phrase_from_key(public_key_data, conn=client)

-    @Parametrizations.SSH_KEY_SELECTION.value

+    @Parametrize.SSH_KEY_SELECTION

     def test_210_ssh_key_selector(

         self,

         monkeypatch: pytest.MonkeyPatch,

@@ -733,7 +733,7 @@ class TestAgentInteraction:

             ):

                 ssh_agent.SSHAgentClient()

-    @Parametrizations.TRUNCATED_AGENT_RESPONSES.value

+    @Parametrize.TRUNCATED_AGENT_RESPONSES

     def test_310_truncated_server_response(

         self,

         running_ssh_agent: tests.RunningSSHAgentInfo,

@@ -757,7 +757,7 @@ class TestAgentInteraction:

             with pytest.raises(EOFError):

                 client.request(255, b'')

-    @Parametrizations.LIST_KEYS_ERROR_RESPONSES.value

+    @Parametrize.LIST_KEYS_ERROR_RESPONSES

     def test_320_list_keys_error_responses(

         self,

         running_ssh_agent: tests.RunningSSHAgentInfo,

@@ -817,7 +817,7 @@ class TestAgentInteraction:

             with pytest.raises(exc_type, match=exc_pattern):

                 client.list_keys()

-    @Parametrizations.SIGN_ERROR_RESPONSES.value

+    @Parametrize.SIGN_ERROR_RESPONSES

     def test_330_sign_error_responses(

         self,

         running_ssh_agent: tests.RunningSSHAgentInfo,

@@ -886,7 +886,7 @@ class TestAgentInteraction:

             with pytest.raises(exc_type, match=exc_pattern):

                 client.sign(key, b'abc', check_if_key_loaded=check)

-    @Parametrizations.REQUEST_ERROR_RESPONSES.value

+    @Parametrize.REQUEST_ERROR_RESPONSES

     def test_340_request_error_responses(

         self,

         running_ssh_agent: tests.RunningSSHAgentInfo,

@@ -914,7 +914,7 @@ class TestAgentInteraction:

             client = stack.enter_context(ssh_agent.SSHAgentClient())

             client.request(request_code, b'', response_code=response_code)

-    @Parametrizations.QUERY_EXTENSIONS_MALFORMED_RESPONSES.value

+    @Parametrize.QUERY_EXTENSIONS_MALFORMED_RESPONSES

     def test_350_query_extensions_malformed_responses(

         self,

         monkeypatch: pytest.MonkeyPatch,

@@ -5,8 +5,8 @@

 from __future__ import annotations

 import copy

-import enum

 import math

+import types

 import hypothesis

 import pytest

@@ -67,7 +67,7 @@ def js_nested_strategy(draw: strategies.DrawFn) -> Any:

     )

-class Parametrizations(enum.Enum):

+class Parametrize(types.SimpleNamespace):

     VALID_VAULT_TEST_CONFIGS = pytest.mark.parametrize(

         'test_config',

         [

@@ -101,7 +101,7 @@ def test_100_js_truthiness(value: Any) -> None:

     assert _types.js_truthiness(value) == expected

-@Parametrizations.VALID_VAULT_TEST_CONFIGS.value

+@Parametrize.VALID_VAULT_TEST_CONFIGS

 def test_200_is_vault_config(test_config: tests.VaultTestConfig) -> None:

     """Is this vault configuration recognized as valid/invalid?

@@ -156,7 +156,7 @@ def test_200a_is_vault_config_smudged(

     )

-@Parametrizations.VAULT_TEST_CONFIGS.value

+@Parametrize.VAULT_TEST_CONFIGS

 def test_400_validate_vault_config(test_config: tests.VaultTestConfig) -> None:

     """Validate this vault configuration.

@@ -7,9 +7,9 @@

 from __future__ import annotations

 import array

-import enum

 import hashlib

 import math

+import types

 from typing import TYPE_CHECKING

 import hypothesis

@@ -42,7 +42,7 @@ The standard derived passphrase for the "twitter" service, from

 """

-class Parametrizations(enum.Enum):

+class Parametrize(types.SimpleNamespace):

     ENTROPY_RESULTS = pytest.mark.parametrize(

         ['length', 'settings', 'entropy'],

         [

@@ -318,7 +318,7 @@ class TestVault:

             phrase=phrases[0], service=service

         ) == vault.Vault.create_hash(phrase=phrases[1], service=service)

-    @Parametrizations.SAMPLE_SERVICES_AND_PHRASES.value

+    @Parametrize.SAMPLE_SERVICES_AND_PHRASES

     def test_200_basic_configuration(

         self, service: bytes | str, expected: bytes

     ) -> None:

@@ -798,7 +798,7 @@ class TestVault:

         """Removing allowed characters internally works."""

         assert vault.Vault._subtract(b'be', b'abcdef') == bytearray(b'acdf')

-    @Parametrizations.ENTROPY_RESULTS.value

+    @Parametrize.ENTROPY_RESULTS

     def test_221_entropy(

         self, length: int, settings: dict[str, int], entropy: int

     ) -> None:

@@ -828,7 +828,7 @@ class TestVault:

         assert v._entropy() == 0.0

         assert v._estimate_sufficient_hash_length() > 0

-    @Parametrizations.SAMPLE_SERVICES_AND_PHRASES.value

+    @Parametrize.SAMPLE_SERVICES_AND_PHRASES

     def test_223_hash_length_expansion(

         self,

         monkeypatch: pytest.MonkeyPatch,

@@ -847,7 +847,7 @@ class TestVault:

         assert v._estimate_sufficient_hash_length() < len(self.phrase)

         assert v.generate(service) == expected

-    @Parametrizations.BINARY_STRINGS.value

+    @Parametrize.BINARY_STRINGS

     def test_224_binary_strings(self, s: str | bytes | bytearray) -> None:

         """Byte string conversion is idempotent."""

         binstr = vault.Vault._get_binary_string

@@ -7,12 +7,12 @@

 from __future__ import annotations

 import contextlib

-import enum

 import errno

 import gettext