From 61c9479e795fa1816d2cde463f4d19478ebc76f1 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 15 Oct 2026 11:08:09 +0200 Subject: [PATCH 1/2] test/integration/jw-pkg -> test/integration/jw_pkg The mypy module names of the test tree derive from the full path, anchored by the top-level test/__init__.py, but a file below a path component that is not a valid identifier - the dashes in jw-pkg - falls back to the bare file name, so two same-named test.py drivers collide (the duplicate module error that drove the runme.py and main.py renames). Rename the directory a sane Python name - jw_pkg, that's the better fix. Then name the driver test.py like all the others for consistency. Signed-off-by: Jan Lindemann --- test/integration/{jw-pkg => jw_pkg}/Makefile | 0 test/integration/{jw-pkg => jw_pkg}/help/Makefile | 0 test/integration/{jw-pkg => jw_pkg}/help/test-expected.txt | 0 test/integration/{jw-pkg => jw_pkg}/help/test.sh | 0 test/integration/{jw-pkg => jw_pkg}/packages/Makefile | 0 test/integration/{jw-pkg => jw_pkg}/packages/ls/Makefile | 0 test/integration/{jw-pkg => jw_pkg}/packages/ls/test.out.expected | 0 test/integration/{jw-pkg => jw_pkg}/projects/Makefile | 0 test/integration/{jw-pkg => jw_pkg}/projects/cache/Makefile | 0 test/integration/{jw-pkg => jw_pkg}/projects/create-file/Makefile | 0 .../{jw-pkg => jw_pkg}/projects/create-file/templates/basic.tmpl | 0 .../{jw-pkg => jw_pkg}/projects/create-file/templates/list.tmpl | 0 .../{jw-pkg => jw_pkg}/projects/create-file/test-expected.txt | 0 test/integration/{jw-pkg => jw_pkg}/projects/create-file/test.sh | 0 .../{jw-pkg => jw_pkg}/projects/create-pkg-config/Makefile | 0 .../projects/create-pkg-config/test-expected.txt | 0 .../{jw-pkg => jw_pkg}/projects/create-pkg-config/test.sh | 0 .../integration/{jw-pkg => jw_pkg}/projects/pkg-requires/Makefile | 0 .../projects/pkg-requires/proj/dep-target/VERSION | 0 .../projects/pkg-requires/proj/dep-target/make/project.conf | 0 .../projects/pkg-requires/proj/excl-all/VERSION | 0 .../projects/pkg-requires/proj/excl-all/make/project.conf | 0 .../projects/pkg-requires/proj/excl-never/VERSION | 0 .../projects/pkg-requires/proj/excl-never/make/project.conf | 0 .../{jw-pkg => jw_pkg}/projects/pkg-requires/test-expected.txt | 0 test/integration/{jw-pkg => jw_pkg}/projects/pkg-requires/test.sh | 0 test/integration/{jw-pkg => jw_pkg}/secrets/Makefile | 0 .../{jw-pkg/secrets/runme.py => jw_pkg/secrets/test.py} | 0 28 files changed, 0 insertions(+), 0 deletions(-) rename test/integration/{jw-pkg => jw_pkg}/Makefile (100%) rename test/integration/{jw-pkg => jw_pkg}/help/Makefile (100%) rename test/integration/{jw-pkg => jw_pkg}/help/test-expected.txt (100%) rename test/integration/{jw-pkg => jw_pkg}/help/test.sh (100%) rename test/integration/{jw-pkg => jw_pkg}/packages/Makefile (100%) rename test/integration/{jw-pkg => jw_pkg}/packages/ls/Makefile (100%) rename test/integration/{jw-pkg => jw_pkg}/packages/ls/test.out.expected (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/Makefile (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/cache/Makefile (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/create-file/Makefile (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/create-file/templates/basic.tmpl (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/create-file/templates/list.tmpl (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/create-file/test-expected.txt (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/create-file/test.sh (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/create-pkg-config/Makefile (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/create-pkg-config/test-expected.txt (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/create-pkg-config/test.sh (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/pkg-requires/Makefile (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/pkg-requires/proj/dep-target/VERSION (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/pkg-requires/proj/dep-target/make/project.conf (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/pkg-requires/proj/excl-all/VERSION (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/pkg-requires/proj/excl-all/make/project.conf (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/pkg-requires/proj/excl-never/VERSION (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/pkg-requires/proj/excl-never/make/project.conf (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/pkg-requires/test-expected.txt (100%) rename test/integration/{jw-pkg => jw_pkg}/projects/pkg-requires/test.sh (100%) rename test/integration/{jw-pkg => jw_pkg}/secrets/Makefile (100%) rename test/integration/{jw-pkg/secrets/runme.py => jw_pkg/secrets/test.py} (100%) diff --git a/test/integration/jw-pkg/Makefile b/test/integration/jw_pkg/Makefile similarity index 100% rename from test/integration/jw-pkg/Makefile rename to test/integration/jw_pkg/Makefile diff --git a/test/integration/jw-pkg/help/Makefile b/test/integration/jw_pkg/help/Makefile similarity index 100% rename from test/integration/jw-pkg/help/Makefile rename to test/integration/jw_pkg/help/Makefile diff --git a/test/integration/jw-pkg/help/test-expected.txt b/test/integration/jw_pkg/help/test-expected.txt similarity index 100% rename from test/integration/jw-pkg/help/test-expected.txt rename to test/integration/jw_pkg/help/test-expected.txt diff --git a/test/integration/jw-pkg/help/test.sh b/test/integration/jw_pkg/help/test.sh similarity index 100% rename from test/integration/jw-pkg/help/test.sh rename to test/integration/jw_pkg/help/test.sh diff --git a/test/integration/jw-pkg/packages/Makefile b/test/integration/jw_pkg/packages/Makefile similarity index 100% rename from test/integration/jw-pkg/packages/Makefile rename to test/integration/jw_pkg/packages/Makefile diff --git a/test/integration/jw-pkg/packages/ls/Makefile b/test/integration/jw_pkg/packages/ls/Makefile similarity index 100% rename from test/integration/jw-pkg/packages/ls/Makefile rename to test/integration/jw_pkg/packages/ls/Makefile diff --git a/test/integration/jw-pkg/packages/ls/test.out.expected b/test/integration/jw_pkg/packages/ls/test.out.expected similarity index 100% rename from test/integration/jw-pkg/packages/ls/test.out.expected rename to test/integration/jw_pkg/packages/ls/test.out.expected diff --git a/test/integration/jw-pkg/projects/Makefile b/test/integration/jw_pkg/projects/Makefile similarity index 100% rename from test/integration/jw-pkg/projects/Makefile rename to test/integration/jw_pkg/projects/Makefile diff --git a/test/integration/jw-pkg/projects/cache/Makefile b/test/integration/jw_pkg/projects/cache/Makefile similarity index 100% rename from test/integration/jw-pkg/projects/cache/Makefile rename to test/integration/jw_pkg/projects/cache/Makefile diff --git a/test/integration/jw-pkg/projects/create-file/Makefile b/test/integration/jw_pkg/projects/create-file/Makefile similarity index 100% rename from test/integration/jw-pkg/projects/create-file/Makefile rename to test/integration/jw_pkg/projects/create-file/Makefile diff --git a/test/integration/jw-pkg/projects/create-file/templates/basic.tmpl b/test/integration/jw_pkg/projects/create-file/templates/basic.tmpl similarity index 100% rename from test/integration/jw-pkg/projects/create-file/templates/basic.tmpl rename to test/integration/jw_pkg/projects/create-file/templates/basic.tmpl diff --git a/test/integration/jw-pkg/projects/create-file/templates/list.tmpl b/test/integration/jw_pkg/projects/create-file/templates/list.tmpl similarity index 100% rename from test/integration/jw-pkg/projects/create-file/templates/list.tmpl rename to test/integration/jw_pkg/projects/create-file/templates/list.tmpl diff --git a/test/integration/jw-pkg/projects/create-file/test-expected.txt b/test/integration/jw_pkg/projects/create-file/test-expected.txt similarity index 100% rename from test/integration/jw-pkg/projects/create-file/test-expected.txt rename to test/integration/jw_pkg/projects/create-file/test-expected.txt diff --git a/test/integration/jw-pkg/projects/create-file/test.sh b/test/integration/jw_pkg/projects/create-file/test.sh similarity index 100% rename from test/integration/jw-pkg/projects/create-file/test.sh rename to test/integration/jw_pkg/projects/create-file/test.sh diff --git a/test/integration/jw-pkg/projects/create-pkg-config/Makefile b/test/integration/jw_pkg/projects/create-pkg-config/Makefile similarity index 100% rename from test/integration/jw-pkg/projects/create-pkg-config/Makefile rename to test/integration/jw_pkg/projects/create-pkg-config/Makefile diff --git a/test/integration/jw-pkg/projects/create-pkg-config/test-expected.txt b/test/integration/jw_pkg/projects/create-pkg-config/test-expected.txt similarity index 100% rename from test/integration/jw-pkg/projects/create-pkg-config/test-expected.txt rename to test/integration/jw_pkg/projects/create-pkg-config/test-expected.txt diff --git a/test/integration/jw-pkg/projects/create-pkg-config/test.sh b/test/integration/jw_pkg/projects/create-pkg-config/test.sh similarity index 100% rename from test/integration/jw-pkg/projects/create-pkg-config/test.sh rename to test/integration/jw_pkg/projects/create-pkg-config/test.sh diff --git a/test/integration/jw-pkg/projects/pkg-requires/Makefile b/test/integration/jw_pkg/projects/pkg-requires/Makefile similarity index 100% rename from test/integration/jw-pkg/projects/pkg-requires/Makefile rename to test/integration/jw_pkg/projects/pkg-requires/Makefile diff --git a/test/integration/jw-pkg/projects/pkg-requires/proj/dep-target/VERSION b/test/integration/jw_pkg/projects/pkg-requires/proj/dep-target/VERSION similarity index 100% rename from test/integration/jw-pkg/projects/pkg-requires/proj/dep-target/VERSION rename to test/integration/jw_pkg/projects/pkg-requires/proj/dep-target/VERSION diff --git a/test/integration/jw-pkg/projects/pkg-requires/proj/dep-target/make/project.conf b/test/integration/jw_pkg/projects/pkg-requires/proj/dep-target/make/project.conf similarity index 100% rename from test/integration/jw-pkg/projects/pkg-requires/proj/dep-target/make/project.conf rename to test/integration/jw_pkg/projects/pkg-requires/proj/dep-target/make/project.conf diff --git a/test/integration/jw-pkg/projects/pkg-requires/proj/excl-all/VERSION b/test/integration/jw_pkg/projects/pkg-requires/proj/excl-all/VERSION similarity index 100% rename from test/integration/jw-pkg/projects/pkg-requires/proj/excl-all/VERSION rename to test/integration/jw_pkg/projects/pkg-requires/proj/excl-all/VERSION diff --git a/test/integration/jw-pkg/projects/pkg-requires/proj/excl-all/make/project.conf b/test/integration/jw_pkg/projects/pkg-requires/proj/excl-all/make/project.conf similarity index 100% rename from test/integration/jw-pkg/projects/pkg-requires/proj/excl-all/make/project.conf rename to test/integration/jw_pkg/projects/pkg-requires/proj/excl-all/make/project.conf diff --git a/test/integration/jw-pkg/projects/pkg-requires/proj/excl-never/VERSION b/test/integration/jw_pkg/projects/pkg-requires/proj/excl-never/VERSION similarity index 100% rename from test/integration/jw-pkg/projects/pkg-requires/proj/excl-never/VERSION rename to test/integration/jw_pkg/projects/pkg-requires/proj/excl-never/VERSION diff --git a/test/integration/jw-pkg/projects/pkg-requires/proj/excl-never/make/project.conf b/test/integration/jw_pkg/projects/pkg-requires/proj/excl-never/make/project.conf similarity index 100% rename from test/integration/jw-pkg/projects/pkg-requires/proj/excl-never/make/project.conf rename to test/integration/jw_pkg/projects/pkg-requires/proj/excl-never/make/project.conf diff --git a/test/integration/jw-pkg/projects/pkg-requires/test-expected.txt b/test/integration/jw_pkg/projects/pkg-requires/test-expected.txt similarity index 100% rename from test/integration/jw-pkg/projects/pkg-requires/test-expected.txt rename to test/integration/jw_pkg/projects/pkg-requires/test-expected.txt diff --git a/test/integration/jw-pkg/projects/pkg-requires/test.sh b/test/integration/jw_pkg/projects/pkg-requires/test.sh similarity index 100% rename from test/integration/jw-pkg/projects/pkg-requires/test.sh rename to test/integration/jw_pkg/projects/pkg-requires/test.sh diff --git a/test/integration/jw-pkg/secrets/Makefile b/test/integration/jw_pkg/secrets/Makefile similarity index 100% rename from test/integration/jw-pkg/secrets/Makefile rename to test/integration/jw_pkg/secrets/Makefile diff --git a/test/integration/jw-pkg/secrets/runme.py b/test/integration/jw_pkg/secrets/test.py similarity index 100% rename from test/integration/jw-pkg/secrets/runme.py rename to test/integration/jw_pkg/secrets/test.py -- 2.56.0 From 63f0fef12ed91f1fee287a5ad12861b7dd6d9f47 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 5 Oct 2026 12:24:07 +0200 Subject: [PATCH 2/2] test/integration/jw-pkg/secrets: Fix make format fallout Fix a miniscule make format churn. Signed-off-by: Jan Lindemann Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v1.1.0 --- test/integration/jw_pkg/secrets/test.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/integration/jw_pkg/secrets/test.py b/test/integration/jw_pkg/secrets/test.py index 5d82f88d..faf67a68 100644 --- a/test/integration/jw_pkg/secrets/test.py +++ b/test/integration/jw_pkg/secrets/test.py @@ -15,8 +15,7 @@ reverse-domain host prefixes plus a default tree, host wins. Trees whose FileContext supports the targpg:// scheme address it through that scheme, with the tarball location as deployment information in the environment; earlier trees take the tarball URI as the install -src argument. The targpg:// sections are skipped on the earlier -trees. +src argument. The targpg:// sections are skipped on the earlier trees. The fake target is a Local exec context whose uri carries a hostname, so the host-specific secret store prefix is exercised just like on a -- 2.56.0