v0.172.0 fixup 2: drop import/* from the carry-list

Found on the demo-hp live leg: with import, import/paperless and import/calibre
in the carry-list, the derived skeleton RE-CREATES a per-drive drop-zone on every
drive forever — the dead lookalike the canonical root exists to remove, and one
that is never backed up (class: excluded).

Not a zero-removals violation: nothing deletes what an existing box has. Both
demo boxes' old drop-zones were verified to hold zero files before the change.
This commit is contained in:
2026-07-26 08:22:13 +02:00
parent 4773809334
commit 8fadbd9891
4 changed files with 61 additions and 10 deletions
+12 -4
View File
@@ -13,9 +13,12 @@ func TestSharedContentGID(t *testing.T) {
}
}
// TestUserdataSkeleton_List asserts the locked skeleton subdir set. R-75 renamed the hardcoded list
// to UserdataSkeletonCarry (it is now the non-derived carry-list); the asserted set is UNCHANGED,
// which is exactly the zero-removals promise.
// TestUserdataSkeleton_List asserts the locked carry-list. R-75 renamed the hardcoded list to
// UserdataSkeletonCarry (it is now the non-derived carry-list) and DELIBERATELY dropped the three
// `import*` entries: carrying them would re-create a per-drive drop-zone on every drive forever, the
// dead lookalike the canonical root exists to remove. That is not a removal — nothing deletes the
// dirs an existing box has; they stop being maintained and stop appearing on fresh boxes. Every other
// entry is unchanged, which is the zero-removals promise.
func TestUserdataSkeleton_List(t *testing.T) {
got := map[string]bool{}
for _, s := range UserdataSkeletonCarry() {
@@ -23,13 +26,18 @@ func TestUserdataSkeleton_List(t *testing.T) {
}
for _, want := range []string{
"media/movies", "media/tv", "media/music", "media/audiobooks", "media/books",
"media/comics", "media/photos", "downloads", "import/paperless", "import/calibre",
"media/comics", "media/photos", "downloads",
"roms", "documents",
} {
if !got[want] {
t.Errorf("skeleton missing %q", want)
}
}
for _, gone := range []string{"import", "import/paperless", "import/calibre"} {
if got[gone] {
t.Errorf("carry-list must NOT hold %q — the drop-zone is canonical on the system drive (R-75)", gone)
}
}
}
// TestUserdataDir confirms the userdata root is a sibling under the namespace.