derivepassphrase.git

@@ -81,6 +81,7 @@ exclude_also = [

   "raise NotImplementedError",

   'assert False',

   '(?:typing\.)?assert_never\(',

+  '@overload',

 ]

 [tool.coverage.run]

@@ -304,6 +305,15 @@ select = [

   # things), we need to call and to mock several internal functions,

   # which would automatically trigger `SLF001`.

   'SLF001',

+  # pytest does not support sensible introspection of `assert all(...)`

+  # expressions in tests the same way it supports introspection in

+  # `asssert all([...])`.  So the extra list comprehension actually

+  # improves debuggability in this case.

+  'C419',

+  # The tests sometimes include long strings (in non-Python formats)

+  # that should be included verbatim, without artificial line breaking,

+  # so they can be grepped for.

+  'E501',

 ]

 [tool.ruff.lint.flake8-copyright]

@@ -225,8 +225,7 @@ def validate_vault_config(

     *,

     allow_derivepassphrase_extensions: bool,

     allow_unknown_settings: bool = False,

-) -> None:

-    ...  # pragma: no cover

+) -> None: ...

 @overload

@@ -235,8 +234,7 @@ def validate_vault_config(

     /,

     *,

     allow_unknown_settings: bool = False,

-) -> None:

-    ...  # pragma: no cover

+) -> None: ...

 def validate_vault_config(  # noqa: C901,PLR0912

@@ -2374,9 +2376,11 @@ def derivepassphrase_vault(  # noqa: C901,PLR0912,PLR0913,PLR0914,PLR0915

             # cases, set the phrase via vault.Vault.phrase_from_key if

             # a key is given.  Finally, if nothing is set, error out.

             if use_key or use_phrase:

-                kwargs['phrase'] = _key_to_phrase(

-                    key, error_callback=err

-                ) if use_key else phrase

+                kwargs['phrase'] = (

+                    _key_to_phrase(key, error_callback=err)

+                    if use_key

+                    else phrase

+                )

             elif kwargs.get('key'):

                 kwargs['phrase'] = _key_to_phrase(

                     kwargs['key'], error_callback=err

@@ -379,7 +379,7 @@ class SSHAgentClient:

         )

     @overload

-    def request(  # pragma: no cover

+    def request(

         self,

         code: int | _types.SSH_AGENTC,

         payload: Buffer,

@@ -389,7 +389,7 @@ class SSHAgentClient:

     ) -> tuple[int, bytes]: ...

     @overload

-    def request(  # pragma: no cover

+    def request(

         self,

         code: int | _types.SSH_AGENTC,

         payload: Buffer,

@@ -401,7 +401,7 @@ class SSHAgentClient:

     ) -> bytes: ...

     @overload

-    def request(  # pragma: no cover

+    def request(

         self,

         code: int | _types.SSH_AGENTC,

         payload: Buffer,

@@ -487,7 +487,7 @@ idwcakUGCekJD/vCEml2AAAAG3Rlc3Qga2V5IHdpdGhvdXQgcGFzc3BocmFzZQEC

             68 6f 75 74 20 70 61 73 73 70 68 72 61 73 65

 """),

         'public_key': rb"""ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIF4gWgm1gJIXw//Mkhv5MEwidwcakUGCekJD/vCEml2 test key without passphrase

-""",  # noqa: E501

+""",

         'public_key_data': bytes.fromhex("""

             00 00 00 0b 73 73 68 2d 65 64 32 35 35 31 39

             00 00 00 20

@@ -502,7 +502,7 @@ idwcakUGCekJD/vCEml2AAAAG3Rlc3Qga2V5IHdpdGhvdXQgcGFzc3BocmFzZQEC

             0d 08 1f ec f8 73 9b 8c 5f 55 39 16 7c 53 54 2c

             1e 52 bb 30 ed 7f 89 e2 2f 69 51 55 d8 9e a6 02

         """),

-        'derived_passphrase': rb'8JgZgGwal9UmA27M42WPhmYHExkTCSEzM/nkNlMdr/0NCB/s+HObjF9VORZ8U1QsHlK7MO1/ieIvaVFV2J6mAg==',  # noqa: E501

+        'derived_passphrase': rb'8JgZgGwal9UmA27M42WPhmYHExkTCSEzM/nkNlMdr/0NCB/s+HObjF9VORZ8U1QsHlK7MO1/ieIvaVFV2J6mAg==',

     },

     # Currently only supported by PuTTY (which is deficient in other

     # niceties of the SSH agent and the agent's client).

@@ -536,7 +536,7 @@ dGhvdXQgcGFzc3BocmFzZQECAwQFBgcICQ==

             74 68 6f 75 74 20 70 61 73 73 70 68 72 61 73 65

 """),

         'public_key': rb"""ssh-ed448 AAAACXNzaC1lZDQ0OAAAADni9nLTT1a7zATGO8RveGq0vPUY7/53m+YZRsStZDgBQ72ZgtPMckdzabiz7JbM/b0JzcRzGLMsbwA= test key without passphrase

-""",  # noqa: E501

+""",

         'public_key_data': bytes.fromhex("""

             00 00 00 09 73 73 68 2d 65 64 34 34 38

             00 00 00 39 e2 f6 72 d3 4f 56 bb cc 04

@@ -555,7 +555,7 @@ dGhvdXQgcGFzc3BocmFzZQECAwQFBgcICQ==

             db bd 77 7c 80 20 7f 3a 48 61 f6 1f ae a9 5e 53

             7b e0 9d 93 1e ea dc eb b5 cd 56 4c ea 8f 08 00

         """),

-        'derived_passphrase': rb'Bob0ZKSmutnDIsSTSZn8Ed5nlwjy2Lc8LBPnxRwekqYO2C9tgQOCAONy5DJtctJtMoQ/zKkeVywAmrOZ3kXazi7R2+WJ8zW+JFiQxsoE8NuIgNu9d3yAIH86SGH2H66pXlN74J2THurc67XNVkzqjwgA',  # noqa: E501

+        'derived_passphrase': rb'Bob0ZKSmutnDIsSTSZn8Ed5nlwjy2Lc8LBPnxRwekqYO2C9tgQOCAONy5DJtctJtMoQ/zKkeVywAmrOZ3kXazi7R2+WJ8zW+JFiQxsoE8NuIgNu9d3yAIH86SGH2H66pXlN74J2THurc67XNVkzqjwgA',

     },

     'rsa': {

         'private_key': rb"""-----BEGIN OPENSSH PRIVATE KEY-----

@@ -693,7 +693,7 @@ Bgp6142WnSCQAAABt0ZXN0IGtleSB3aXRob3V0IHBhc3NwaHJhc2UB

             74 68 6f 75 74 20 70 61 73 73 70 68 72 61 73 65

 """),

         'public_key': rb"""ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxoe7pezhxWy4NI0mUwKqg9WCYOAS+IjxN9eYcqpfcmQiojcuy9XsiN/xYJ1O94SrsKS5mEia2xHnYA4RUChTyYNcM2v6cnnBQ/N/VQhpGMN7SVxdbhKUXTWFCwbjBgO6rGyHB6WtoH8vd7TOEPt+NgcXwhsWyoaUUdYTA62V+GF9vEmxMaC4ubgDz+B0QkPnauSoNxmkhcIe0lsLNb1pClZyz88PDnKXCX/d0HuN/HJ+sbPg7dCvOyqFYSyKn3uY6bCXqoIdurxXzH3O7z0P8f5sbmKOrGGKNuNxVRbeVl/D/3uDL0nqsbfUc1qvkfwbJwtMXC4IV6kOZMSk2BAsqh7x48gQ+rhYeEVSi8F3CWs4HJQoqrGt7K9a3mCSlMBHP70u3w6ME7eumoryxlUofewTd17ZEkzdX08l2ZlKzZvwQUrc+xQZ2Uw8z2mfW6Ti4gi0pYGaig7Ke4PwuXpo/C5YAWfeXycsvJZ2uaYRjMdZeJGNAnHLUGLkBscw5aI8= test key without passphrase

-""",  # noqa: E501

+""",

         'public_key_data': bytes.fromhex("""

             00 00 00 07 73 73 68 2d 72 73 61

             00 00 00 03 01 00 01

@@ -751,7 +751,7 @@ Bgp6142WnSCQAAABt0ZXN0IGtleSB3aXRob3V0IHBhc3NwaHJhc2UB

             de 69 2c 48 62 d9 fd d1 9b 6b b0 49 db d3 ff 38

             e7 10 d9 2d ce 9f 0d 5e 09 7b 37 d2 7b c3 bf ce

 """),

-        'derived_passphrase': rb'ohB8Lva7U6h0KqEZma2Bvnmc7dadCU5uxRhIM5B3mWj3ngNazU4Y64l9haLurkqS9m/Ouf6GfyprMdpuGv6ipYi4RH+hdnOz7HW10Ka5FZdlCRN9lCHR+10PiyMEd8LDVSKxoAmK9Tgq1n8bhymgJdMlb8tkYQeY3BTFhPiSJF5QEWtJ5fDMKcspqRnYp3EfkQsFsQFLwl8ApbYhv/gsnWebRzsKSWt5Lfwd7Ayw5Sci1an408P530ho6fvvPNwmv8/qKUMBpuPFUZX0Zm2KVeJH7OgwRUyuR+fJpCGLZLq2iPYh+HO5yxGheHWSxlrlZP7tQtmVmeYrbzwWPCh0pHIvDT8sM2eqNRmO57URL7P3asUC4m+jQuNiGZkD6qUg56HjvMgGo7V81nZd329gRoMqCADW09mkwUGM+GBWRYHaO6IWH55OdYMX2sNTwz4ZpBu80im4eGEreOaxUrDV7N5pLEhi2f3Rm2uwSdvT/zjnENktzp8NXgl7N9J7w7/O',  # noqa: E501

+        'derived_passphrase': rb'ohB8Lva7U6h0KqEZma2Bvnmc7dadCU5uxRhIM5B3mWj3ngNazU4Y64l9haLurkqS9m/Ouf6GfyprMdpuGv6ipYi4RH+hdnOz7HW10Ka5FZdlCRN9lCHR+10PiyMEd8LDVSKxoAmK9Tgq1n8bhymgJdMlb8tkYQeY3BTFhPiSJF5QEWtJ5fDMKcspqRnYp3EfkQsFsQFLwl8ApbYhv/gsnWebRzsKSWt5Lfwd7Ayw5Sci1an408P530ho6fvvPNwmv8/qKUMBpuPFUZX0Zm2KVeJH7OgwRUyuR+fJpCGLZLq2iPYh+HO5yxGheHWSxlrlZP7tQtmVmeYrbzwWPCh0pHIvDT8sM2eqNRmO57URL7P3asUC4m+jQuNiGZkD6qUg56HjvMgGo7V81nZd329gRoMqCADW09mkwUGM+GBWRYHaO6IWH55OdYMX2sNTwz4ZpBu80im4eGEreOaxUrDV7N5pLEhi2f3Rm2uwSdvT/zjnENktzp8NXgl7N9J7w7/O',

     },

 }

@@ -816,7 +816,7 @@ u7HfrQhdOiKSa+ZO9AAojbURqrLDRfBJa5dXn2AAAAFQDJHfenj4EJ9WkehpdJatPBlqCW

             74 68 6f 75 74 20 70 61 73 73 70 68 72 61 73 65

 """),

         'public_key': rb"""ssh-dss AAAAB3NzaC1kc3MAAACBALsoBleoEY1UsFA+twxgCg1bngGEPxoiF7sENZjMlyxoy3vZUpKSC5nz5dHudFrQL9mwGL64mnR2nHL1kxM5Zfi7lg8x5BxcR0YTFkh+KYapI4CzLp8KV3Yh8lklkTFwKaF71KyOx3dhIA8lGW45cVBz3kxmhHmEzCUgMPxDOsTtAAAAFQD32c5k6B3tocxUahelQQFyfseiywAAAIAuvYCDeHEzesp3HNVTDx9fRVU9c77f4qvyEZ7Qpz/s3BVoFUvUZDx96cG5bKekBRsfTCjeHXCQH/yFfqn5Lxye7msgGVS5U3AvD9shiiEr3wt+pNgr9X6DooP7ybfjC8SJdmarLBjnifZuSxyHU2q+P+02kvMTFLH9dLSRIzVqKAAAAIBtA1E9xUS4YOsRx/7GDm2AB6M9cE9ev8myz4KGTriSbeaKsxiMBbJZi1VyBP7uE5jG1hGKfwvIwuopGaprRDlSu8N8KGAuG+wb1hJv8ynDmqbw+IdJp/CGRrP+17f7yEqiCqh7ux360IXToikmvmTvQAKI21Eaqyw0XwSWuXV59g== test key without passphrase

-""",  # noqa: E501

+""",

         'public_key_data': bytes.fromhex("""

             00 00 00 07 73 73 68 2d 64 73 73

             00 00 00 81 00

@@ -879,7 +879,7 @@ dGhvdXQgcGFzc3BocmFzZQECAwQ=

             74 68 6f 75 74 20 70 61 73 73 70 68 72 61 73 65

 """),

         'public_key': rb"""ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMttTTMPCyTYO+n5Vgiuw1V/mBbDPZLdJnxNvGJBGSmcZJWrIigck4lz41Ai0BrvGUn/xnqB/PntndqlSRowmbo= test key without passphrase

-""",  # noqa: E501

+""",

         'public_key_data': bytes.fromhex("""

             00 00 00 13 65 63 64

             73 61 2d 73 68 61 32 2d 6e 69 73 74 70 32 35 36

@@ -924,7 +924,7 @@ JAu0J3Q+cypZuKQVAAAAMQD5sTy8p+B1cn/DhOmXquui1BcxvASqzzevkBlbQoBa73y04B

             74 68 6f 75 74 20 70 61 73 73 70 68 72 61 73 65

 """),

         'public_key': rb"""ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBKCQ6OQC+ru/m8e6PcoEvj8QBZyfmFkPIpxvJXR4EwYWruEpdCVmohqEtWp4xHRCqaTE0nauXLZUdxed6re9n718ixYI51iTlY/c1k/O/3XVefvBsSQLtCd0PnMqWbikFQ== test key without passphrase

-""",  # noqa: E501

+""",

         'public_key_data': bytes.fromhex("""

             00 00 00 13 65 63 64

             73 61 2d 73 68 61 32 2d 6e 69 73 74 70 33 38 34

@@ -976,7 +976,7 @@ Rlc3Qga2V5IHdpdGhvdXQgcGFzc3BocmFzZQ==

             74 68 6f 75 74 20 70 61 73 73 70 68 72 61 73 65

 """),

         'public_key': rb"""ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBABJU53APOeaVwaqIu8W1h5W2sASJXOIh+wvuMQzxS27+bxZKQ8VC2PCp0XD5Z9nSaLqoxsQWCL8QvNlIpW14JJtwwCGoCQ4wUqIO7hvG+wzptPTZG7urbJPjXJLIaFQPRDJIGcjoKS3/CdDVMSmPzMMqJESvGz17pAsYSU1GTMs8yz6Yw== test key without passphrase

-""",  # noqa: E501

+""",

         'public_key_data': bytes.fromhex("""

             00 00 00 13 65 63 64

             73 61 2d 73 68 61 32 2d 6e 69 73 74 70 32 35 36

@@ -1023,10 +1023,10 @@ DUMMY_PHRASE_FROM_KEY1_RAW = (

     b'\x1d\xaf\xfd\r\x08\x1f\xec\xf8s\x9b\x8c_U9\x16|ST,'

     b'\x1eR\xbb0\xed\x7f\x89\xe2/iQU\xd8\x9e\xa6\x02'

 )

-DUMMY_PHRASE_FROM_KEY1 = b'8JgZgGwal9UmA27M42WPhmYHExkTCSEzM/nkNlMdr/0NCB/s+HObjF9VORZ8U1QsHlK7MO1/ieIvaVFV2J6mAg=='  # noqa: E501

+DUMMY_PHRASE_FROM_KEY1 = b'8JgZgGwal9UmA27M42WPhmYHExkTCSEzM/nkNlMdr/0NCB/s+HObjF9VORZ8U1QsHlK7MO1/ieIvaVFV2J6mAg=='

 VAULT_MASTER_KEY = 'vault key'

-VAULT_V02_CONFIG = 'P7xeh5y4jmjpJ2pFq4KUcTVoaE9ZOEkwWmpVTURSSWQxbGt6emN4aFE4eFM3anVPbDRNTGpOLzY3eDF5aE1YTm5LNWh5Q1BwWTMwM3M5S083MWRWRFlmOXNqSFJNcStGMWFOS3c2emhiOUNNenZYTmNNMnZxaUErdlRoOGF2ZHdGT1ZLNTNLOVJQcU9jWmJrR3g5N09VcVBRZ0ZnSFNUQy9HdFVWWnFteVhRVkY3MHNBdnF2ZWFEbFBseWRGelE1c3BFTnVUckRQdWJSL29wNjFxd2Y2ZVpob3VyVzRod3FKTElTenJ1WTZacTJFOFBtK3BnVzh0QWVxcWtyWFdXOXYyenNQeFNZbWt1MDU2Vm1kVGtISWIxWTBpcWRFbyswUVJudVVhZkVlNVpGWDA4WUQ2Q2JTWW81SnlhQ2Zxa3cxNmZoQjJES0Uyd29rNXpSck5iWVBrVmEwOXFya1NpMi9saU5LL3F0M3N3MjZKekNCem9ER2svWkZ0SUJLdmlHRno0VlQzQ3pqZTBWcTM3YmRiNmJjTkhqUHZoQ0NxMW1ldW1XOFVVK3pQMEtUMkRMVGNvNHFlOG40ck5KcGhsYXg1b1VzZ1NYU1B2T3RXdEkwYzg4NWE3YWUzOWI1MDI0MThhMWZjODQ3MDA2OTJmNDQ0MDkxNGFiNmRlMGQ2YjZiNjI5NGMwN2IwMmI4MGZi'  # noqa: E501

+VAULT_V02_CONFIG = 'P7xeh5y4jmjpJ2pFq4KUcTVoaE9ZOEkwWmpVTURSSWQxbGt6emN4aFE4eFM3anVPbDRNTGpOLzY3eDF5aE1YTm5LNWh5Q1BwWTMwM3M5S083MWRWRFlmOXNqSFJNcStGMWFOS3c2emhiOUNNenZYTmNNMnZxaUErdlRoOGF2ZHdGT1ZLNTNLOVJQcU9jWmJrR3g5N09VcVBRZ0ZnSFNUQy9HdFVWWnFteVhRVkY3MHNBdnF2ZWFEbFBseWRGelE1c3BFTnVUckRQdWJSL29wNjFxd2Y2ZVpob3VyVzRod3FKTElTenJ1WTZacTJFOFBtK3BnVzh0QWVxcWtyWFdXOXYyenNQeFNZbWt1MDU2Vm1kVGtISWIxWTBpcWRFbyswUVJudVVhZkVlNVpGWDA4WUQ2Q2JTWW81SnlhQ2Zxa3cxNmZoQjJES0Uyd29rNXpSck5iWVBrVmEwOXFya1NpMi9saU5LL3F0M3N3MjZKekNCem9ER2svWkZ0SUJLdmlHRno0VlQzQ3pqZTBWcTM3YmRiNmJjTkhqUHZoQ0NxMW1ldW1XOFVVK3pQMEtUMkRMVGNvNHFlOG40ck5KcGhsYXg1b1VzZ1NYU1B2T3RXdEkwYzg4NWE3YWUzOWI1MDI0MThhMWZjODQ3MDA2OTJmNDQ0MDkxNGFiNmRlMGQ2YjZiNjI5NGMwN2IwMmI4MGZi'

 VAULT_V02_CONFIG_DATA = {

     'global': {

         'phrase': DUMMY_PASSPHRASE.rstrip('\n'),

@@ -1038,7 +1038,7 @@ VAULT_V02_CONFIG_DATA = {

         DUMMY_SERVICE: DUMMY_CONFIG_SETTINGS.copy(),

     },

 }

-VAULT_V03_CONFIG = 'sBPBrr8BFHPxSJkV/A53zk9zwDQHFxLe6UIusCVvzFQre103pcj5xxmE11lMTA0U2QTYjkhRXKkH5WegSmYpAnzReuRsYZlWWp6N4kkubf+twZ9C3EeggPm7as2Af4TICHVbX4uXpIHeQJf9y1OtqrO+SRBrgPBzgItoxsIxebxVKgyvh1CZQOSkn7BIzt9xKhDng3ubS4hQ91fB0QCumlldTbUl8tj4Xs5JbvsSlUMxRlVzZ0OgAOrSsoWELXmsp6zXFa9K6wIuZa4wQuMLQFHiA64JO1CR3I+rviWCeMlbTOuJNx6vMB5zotKJqA2hIUpN467TQ9vI4g/QTo40m5LT2EQKbIdTvBQAzcV4lOcpr5Lqt4LHED5mKvm/4YfpuuT3I3XCdWfdG5SB7ciiB4Go+xQdddy3zZMiwm1fEwIB8XjFf2cxoJdccLQ2yxf+9diedBP04EsMHrvxKDhQ7/vHl7xF2MMFTDKl3WFd23vvcjpR1JgNAKYprG/e1p/7'  # noqa: E501

+VAULT_V03_CONFIG = 'sBPBrr8BFHPxSJkV/A53zk9zwDQHFxLe6UIusCVvzFQre103pcj5xxmE11lMTA0U2QTYjkhRXKkH5WegSmYpAnzReuRsYZlWWp6N4kkubf+twZ9C3EeggPm7as2Af4TICHVbX4uXpIHeQJf9y1OtqrO+SRBrgPBzgItoxsIxebxVKgyvh1CZQOSkn7BIzt9xKhDng3ubS4hQ91fB0QCumlldTbUl8tj4Xs5JbvsSlUMxRlVzZ0OgAOrSsoWELXmsp6zXFa9K6wIuZa4wQuMLQFHiA64JO1CR3I+rviWCeMlbTOuJNx6vMB5zotKJqA2hIUpN467TQ9vI4g/QTo40m5LT2EQKbIdTvBQAzcV4lOcpr5Lqt4LHED5mKvm/4YfpuuT3I3XCdWfdG5SB7ciiB4Go+xQdddy3zZMiwm1fEwIB8XjFf2cxoJdccLQ2yxf+9diedBP04EsMHrvxKDhQ7/vHl7xF2MMFTDKl3WFd23vvcjpR1JgNAKYprG/e1p/7'

 VAULT_V03_CONFIG_DATA = {

     'global': {

         'phrase': DUMMY_PASSPHRASE.rstrip('\n'),

@@ -254,7 +254,7 @@ def running_ssh_agent(  # pragma: no cover

                 assert (

                     os.environ.get('SSH_AUTH_SOCK', None)

                     == startup_ssh_auth_sock

-                ), f'SSH_AUTH_SOCK mismatch when checking for spawnable {exec_name}'  # noqa: E501

+                ), f'SSH_AUTH_SOCK mismatch when checking for spawnable {exec_name}'

                 proc = spawn_func(executable=shutil.which(exec_name), env={})

                 if proc is None:

                     continue

@@ -370,7 +370,7 @@ def spawn_ssh_agent(

         else:

             assert (

                 os.environ.get('SSH_AUTH_SOCK', None) == startup_ssh_auth_sock

-            ), f'SSH_AUTH_SOCK mismatch when checking for spawnable {exec_name}'  # noqa: E501

+            ), f'SSH_AUTH_SOCK mismatch when checking for spawnable {exec_name}'

             proc = spawn_func(

                 executable=shutil.which(exec_name), env=agent_env

             )

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

                 }),

                 (

                     "Invalid value 'XXX' for config key "

-                    "vault.default-unicode-normalization-form"

+                    'vault.default-unicode-normalization-form'

                 ),

                 id='global',

             ),

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

                 }),

                 (

                     "Invalid value 'XXX' for config key "

-                    "vault.with_normalization.unicode-normalization-form"

+                    'vault.with_normalization.unicode-normalization-form'

                 ),

                 id='service',

             ),

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

             assert result.error_exit(

                 error=(

                     "Invalid value 'XXX' for config key "

-                    "vault.default-unicode-normalization-form"

+                    'vault.default-unicode-normalization-form'

                 ),

             ), 'expected error exit and known error message'

@@ -1953,7 +1953,7 @@ Our menu:

 Your selection? (1-10, leave empty to abort): 9

 A fine choice: Spam, spam, spam, spam, spam, spam, baked beans, spam, spam, spam and spam

 (Note: Vikings strictly optional.)

-"""  # noqa: E501

+"""

         ), 'expected clean exit'

         _result = runner.invoke(

             driver, ['--heading='], input='', catch_exceptions=True

@@ -1976,7 +1976,7 @@ A fine choice: Spam, spam, spam, spam, spam, spam, baked beans, spam, spam, spam

 [9] Spam, spam, spam, spam, spam, spam, baked beans, spam, spam, spam and spam

 [10] Lobster thermidor aux crevettes with a mornay sauce garnished with truffle paté, brandy and a fried egg on top and spam

 Your selection? (1-10, leave empty to abort):\x20

-"""  # noqa: E501

+"""

         ), 'expected known output'

     def test_112_prompt_for_selection_single(self) -> None:

@@ -2515,9 +2514,7 @@ Boo.

             ):

                 cli._key_to_phrase(loaded_key, error_callback=err)

         with monkeypatch.context() as mp:

-            mp.setenv(

-                'SSH_AUTH_SOCK', os.environ['SSH_AUTH_SOCK'] + '~'

-            )

+            mp.setenv('SSH_AUTH_SOCK', os.environ['SSH_AUTH_SOCK'] + '~')

             with pytest.raises(

                 CustomError, match='Cannot connect to SSH agent'

             ):

@@ -3043,7 +3040,7 @@ class ConfigManagementStateMachine(stateful.RuleBasedStateMachine):

             _vault_full_config,

             min_size=4,

             max_size=4,

-        )

+        ),

     )

     def extract_initial_settings(

         self,

@@ -47,17 +47,17 @@ class TestStaticFunctionality:

         ['line', 'env_name', 'value'],

         [

             (

-                'SSH_AUTH_SOCK=/tmp/pageant.user/pageant.27170; export SSH_AUTH_SOCK;',  # noqa: E501

+                'SSH_AUTH_SOCK=/tmp/pageant.user/pageant.27170; export SSH_AUTH_SOCK;',

                 'SSH_AUTH_SOCK',

                 '/tmp/pageant.user/pageant.27170',

             ),

             (

-                'SSH_AUTH_SOCK=/tmp/ssh-3CSTC1W5M22A/agent.27270; export SSH_AUTH_SOCK;',  # noqa: E501

+                'SSH_AUTH_SOCK=/tmp/ssh-3CSTC1W5M22A/agent.27270; export SSH_AUTH_SOCK;',

                 'SSH_AUTH_SOCK',

                 '/tmp/ssh-3CSTC1W5M22A/agent.27270',

             ),

             (

-                'SSH_AUTH_SOCK=/tmp/pageant.user/pageant.27170; export SSH_AUTH_SOCK',  # noqa: E501

+                'SSH_AUTH_SOCK=/tmp/pageant.user/pageant.27170; export SSH_AUTH_SOCK',

                 'SSH_AUTH_SOCK',

                 '/tmp/pageant.user/pageant.27170',

             ),