All of lore.kernel.org
 help / color / mirror / Atom feed
From: Adrian Neftali Sanchez <lutgaru@gmail.com>
To: tools@linux.kernel.org
Cc: konstantin@linuxfoundation.org,
	Adrian Neftali Sanchez <lutgaru@gmail.com>
Subject: [RFC PATCH 09/13] tests: replace NamedTemporaryFile with tmp_path in patatt fixture
Date: Sat, 25 Apr 2026 12:49:37 -0700	[thread overview]
Message-ID: <20260425194943.1499-10-lutgaru@gmail.com> (raw)
In-Reply-To: <20260425194943.1499-1-lutgaru@gmail.com>

Use pytest's built-in tmp_path fixture to store the ephemeral ed25519
private key instead of tempfile.NamedTemporaryFile.  This removes the
manual os.unlink teardown step (pytest removes the directory
automatically, even when a test raises) and also avoids the Windows
restriction that a NamedTemporaryFile with delete=True cannot be opened
by a second process while still open.

Signed-off-by: Adrian Neftali Sanchez <lutgaru@gmail.com>
---
 src/tests/test_patatt.py | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/tests/test_patatt.py b/src/tests/test_patatt.py
index de05277..3ed4711 100644
--- a/src/tests/test_patatt.py
+++ b/src/tests/test_patatt.py
@@ -6,6 +6,7 @@ Uses ephemeral ed25519 keys so no external key material is needed.
 import base64
 import email.message
 import os
+import pathlib
 import tempfile
 from collections.abc import Generator
 from typing import Tuple, Union
@@ -18,21 +19,29 @@ import patatt
 
 
 @pytest.fixture()
-def ed25519_keypair() -> Generator[Tuple[str, str, str, str], None, None]:
-    """Generate an ephemeral ed25519 keypair written to temp files.
-
-    Returns (privkey_path, verify_key_b64, identity, selector).
-    The private key file is written so patatt can find it via
-    signingkey = ed25519:/path/to/key.
+def ed25519_keypair(
+    tmp_path: pathlib.Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> Generator[Tuple[str, str, str, str], None, None]:
+    """Generate an ephemeral ed25519 keypair stored in patatt's data directory.
+
+    Returns (key_name, verify_key_b64, identity, selector).  The private key
+    is written to ``<tmp_path>/patatt/private/<key_name>.key``.  XDG_DATA_HOME
+    is pointed at ``tmp_path`` for the duration of the test so patatt resolves
+    the key by name without any OS-specific absolute-path handling.
+    patatt.KEYCACHE is cleared to prevent key material from a previous test
+    leaking into this one (all tests share the identity "test@example.com").
     """
     sk = SigningKey.generate()
     sk_b64 = base64.b64encode(sk.encode()).decode()
     vk_b64 = base64.b64encode(sk.verify_key.encode()).decode()
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.key', delete=False) as fh:
-        fh.write(sk_b64)
-        privkey_path = fh.name
-    yield privkey_path, vk_b64, 'test@example.com', 'default'
-    os.unlink(privkey_path)
+    key_name = 'test-key'
+    private_dir = tmp_path / 'patatt' / 'private'
+    private_dir.mkdir(parents=True, exist_ok=True)
+    (private_dir / f'{key_name}.key').write_text(sk_b64)
+    monkeypatch.setenv('XDG_DATA_HOME', str(tmp_path))
+    monkeypatch.setattr(patatt, 'KEYCACHE', {})
+    yield key_name, vk_b64, 'test@example.com', 'default'
 
 
 @pytest.fixture()
-- 
2.45.0.windows.1


  parent reply	other threads:[~2026-04-25 19:50 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-25 19:49 [RFC PATCH 00/13] b4: add native Windows support Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 01/13] tests: specify UTF-8 encoding when opening files in text mode Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 02/13] tests: use os.path.join/normpath for portable path assertions Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 03/13] b4: add cross-platform username resolution in _setup_user_config Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 04/13] b4: resolve platform-native data and cache directories Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 05/13] b4: normalise git-reported absolute paths with os.path.normpath Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 06/13] b4: select platform-appropriate default pager Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 07/13] ez: use portable uid/gid accessors in write_to_tar Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 08/13] tui: The _suspend_to_shell function assumes a POSIX environment, relying on $SHELL and shell-specific arguments (e.g., --rcfile) that are invalid on Windows Adrian Neftali Sanchez
2026-04-25 19:49 ` Adrian Neftali Sanchez [this message]
2026-04-25 19:49 ` [RFC PATCH 10/13] pyproject: add Windows operating-system classifier Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 11/13] ci: add ci.ps1 for running the quality-gate pipeline on Windows Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 12/13] review_tui: write git tracking commit before updating DB Adrian Neftali Sanchez
2026-04-25 19:49 ` [RFC PATCH 13/13] review_tui: guard against unmounted diff-viewer In certain asynchronous contexts or during rapid UI transitions, _show_content may be invoked before the diff-viewer widget has been fully mounted in the DOM. This is particularly reproducible in headless test environments and on platforms with slower console I/O initialization Adrian Neftali Sanchez

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260425194943.1499-10-lutgaru@gmail.com \
    --to=lutgaru@gmail.com \
    --cc=konstantin@linuxfoundation.org \
    --cc=tools@linux.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.