derivepassphrase.git

@@ -285,35 +285,22 @@ class VaultTestConfig(NamedTuple):

     validation_settings: ValidationSettings | None

     """"""

-

-def is_valid_test_config(conf: VaultTestConfig, /) -> bool:

-    """Return true if the test config is valid.

-

-    Args:

-        conf: The test config to check.

-

-    """

-    return not conf.comment and conf.validation_settings in {

+    def is_valid(self, /) -> bool:

+        """Return true if this test config is valid."""

+        return not self.comment and self.validation_settings in {

             None,

             (True,),

         }

+    def is_smudgable(self) -> bool:

+        """Return true if this vault test config can be effectively smudged.

-def is_smudgable_vault_test_config(conf: VaultTestConfig) -> bool:

-    """Check whether this vault test config can be effectively smudged.

-

-    A "smudged" test config is one where falsy values (in the JavaScript

-    sense) can be replaced by other falsy values without changing the

-    meaning of the config.

-

-    Args:

-        conf: A test config to check.

-

-    Returns:

-        True if the test config can be smudged, False otherwise.

+        A "smudged" test config is one where falsy values (in the

+        JavaScript sense) can be replaced by other falsy values without

+        changing the meaning of the config.

         """

-    config = conf.config

+        config = self.config

         return bool(

             isinstance(config, dict)

             and ("global" not in config or isinstance(config["global"], dict))

@@ -322,11 +309,9 @@ def is_smudgable_vault_test_config(conf: VaultTestConfig) -> bool:

             and (config["services"] or config.get("global"))

         )

-

-def _test_config_ids(val: VaultTestConfig) -> Any:  # pragma: no cover

-    """pytest id function for VaultTestConfig objects."""

-    assert isinstance(val, VaultTestConfig)

-    return val[1] or (val[0], val[1], val[2])

+    def _test_id(self) -> Any:  # pragma: no cover

+        """Return a test ID, e.g., for `pytest`."""

+        return self[1] or (self[0], self[1], self[2])

 # Data objects

@@ -107,7 +107,7 @@ def vault_full_service_config(draw: strategies.DrawFn) -> dict[str, int]:

 def smudged_vault_test_config(

     draw: strategies.DrawFn,

     config: Any = strategies.sampled_from(tests.data.TEST_CONFIGS).filter(  # noqa: B008

-        tests.data.is_smudgable_vault_test_config

+        tests.data.VaultTestConfig.is_smudgable

     ),

 ) -> Any:

     """Hypothesis strategy to replace falsy values with other falsy values.

@@ -132,7 +132,7 @@ def smudged_vault_test_config(

     falsy_no_str = (None, False, 0, 0.0, float("nan"))

     falsy_no_zero = (None, False, "", float("nan"))

     conf = draw(config)

-    hypothesis.assume(tests.data.is_smudgable_vault_test_config(conf))

+    hypothesis.assume(conf.is_smudgable())

     obj = copy.deepcopy(conf.config)

     services: list[dict[str, Any]] = list(obj["services"].values())

     if "global" in obj:

@@ -1221,11 +1221,7 @@ class Parametrize(types.SimpleNamespace):

     )

     VALID_TEST_CONFIGS = pytest.mark.parametrize(

         "config",

-        [

-            conf.config

-            for conf in TEST_CONFIGS

-            if tests.data.is_valid_test_config(conf)

-        ],

+        [conf.config for conf in TEST_CONFIGS if conf.is_valid()],

     )

     KEY_OVERRIDING_IN_CONFIG = pytest.mark.parametrize(

         ["config", "command_line"],

@@ -3083,9 +3079,7 @@ class TestCLI:

     @hypothesis.given(

         conf=tests.machinery.hypothesis.smudged_vault_test_config(

             strategies.sampled_from([

-                conf

-                for conf in tests.data.TEST_CONFIGS

-                if tests.data.is_valid_test_config(conf)

+                conf for conf in tests.data.TEST_CONFIGS if conf.is_valid()

             ])

         )

     )

@@ -77,10 +77,12 @@ class Parametrize(types.SimpleNamespace):

             for conf in tests.data.TEST_CONFIGS

             if conf.validation_settings in {None, (True,)}

         ],

-        ids=tests.data._test_config_ids,

+        ids=tests.data.VaultTestConfig._test_id,

     )

     VAULT_TEST_CONFIGS = pytest.mark.parametrize(

-        "test_config", tests.data.TEST_CONFIGS, ids=tests.data._test_config_ids

+        "test_config",

+        tests.data.TEST_CONFIGS,

+        ids=tests.data.VaultTestConfig._test_id,

     )

@@ -127,9 +129,7 @@ def test_200_is_vault_config(test_config: tests.data.VaultTestConfig) -> None:

 @hypothesis.given(

     test_config=tests.machinery.hypothesis.smudged_vault_test_config(

         config=strategies.sampled_from([

-            conf

-            for conf in tests.data.TEST_CONFIGS

-            if tests.data.is_valid_test_config(conf)

+            conf for conf in tests.data.TEST_CONFIGS if conf.is_valid()

         ])

     )

 )

@@ -194,9 +194,7 @@ def test_400_validate_vault_config(

 @hypothesis.given(

     test_config=tests.machinery.hypothesis.smudged_vault_test_config(

         config=strategies.sampled_from([

-            conf

-            for conf in tests.data.TEST_CONFIGS

-            if tests.data.is_smudgable_vault_test_config(conf)

+            conf for conf in tests.data.TEST_CONFIGS if conf.is_smudgable()

         ])

     )

 )