From 161abbc621dd66a101c8c238af8bdf8978c5736d Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 22 Oct 2026 21:38:16 +0200 Subject: [PATCH] Name no node in xterm's, xorg's, mesh-catalog's, lemurs's, fail2ban's, docker's, bluetooth's and adwaita's fixtures (issue 1838) --- modules/adwaita/README.md | 2 +- modules/bluetooth/cmd/bluetooth-tools/bluetooth_test.go | 4 ++-- modules/docker/cmd/docker-tools/resolv_test.go | 4 ++-- modules/fail2ban/cmd/fail2ban-tools/own.go | 2 +- modules/fail2ban/cmd/fail2ban-tools/own_test.go | 2 +- modules/lemurs/README.md | 2 +- modules/mesh-catalog/test/heard.test.ts | 4 ++-- modules/xorg/README.md | 2 +- modules/xterm/README.md | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/adwaita/README.md b/modules/adwaita/README.md index 040a46d2..ec718e70 100644 --- a/modules/adwaita/README.md +++ b/modules/adwaita/README.md @@ -86,7 +86,7 @@ login. ## What changes when it is assigned -| | g14 | shanks | +| | node-b | node-d | |---|---|---| | packages | none (all present) | the same | | GTK settings, `portals.conf` | the found files kept once, then the module's: adds the cursor and Inter, keeps Adwaita dark; `portals.conf` adds the Secret line | the same | diff --git a/modules/bluetooth/cmd/bluetooth-tools/bluetooth_test.go b/modules/bluetooth/cmd/bluetooth-tools/bluetooth_test.go index 117c5e5c..988901d1 100644 --- a/modules/bluetooth/cmd/bluetooth-tools/bluetooth_test.go +++ b/modules/bluetooth/cmd/bluetooth-tools/bluetooth_test.go @@ -20,7 +20,7 @@ func TestTheManifestIsTheStackItsToolsAndTheDaemon(t *testing.T) { } } -const show = "Controller 4C:82:A9:97:01:8E (public)\n\tName: g14\n\tAlias: g14\n\tPowered: yes\n\tPowerState: on\n\tDiscoverable: no\n\tPairable: yes\n\tUUID: Headset (00001108-0000-1000-8000-00805f9b34fb)\n\tDiscovering: no\n" +const show = "Controller 4C:82:A9:97:01:8E (public)\n\tName: node-b\n\tAlias: node-b\n\tPowered: yes\n\tPowerState: on\n\tDiscoverable: no\n\tPairable: yes\n\tUUID: Headset (00001108-0000-1000-8000-00805f9b34fb)\n\tDiscovering: no\n" func headphones(connected bool) string { c := "no" @@ -34,7 +34,7 @@ func headphones(connected bool) string { func TestControllerReadsShow(t *testing.T) { using(t, func(string, Cmd) Result { return ok("\x1b[0;94m" + show) }) c, err := Controller() - if err != nil || c.Address != "4C:82:A9:97:01:8E" || c.Name != "g14" || !c.Powered || c.Discoverable || !c.Pairable { + if err != nil || c.Address != "4C:82:A9:97:01:8E" || c.Name != "node-b" || !c.Powered || c.Discoverable || !c.Pairable { t.Fatalf("%+v %v", c, err) } using(t, func(string, Cmd) Result { return ok("No default controller available\n") }) diff --git a/modules/docker/cmd/docker-tools/resolv_test.go b/modules/docker/cmd/docker-tools/resolv_test.go index 6c1285e8..f0728d1a 100644 --- a/modules/docker/cmd/docker-tools/resolv_test.go +++ b/modules/docker/cmd/docker-tools/resolv_test.go @@ -32,7 +32,7 @@ func archiveOf(t *testing.T, h tar.Header, body string) string { // Issue 348: route-proxy asked 10.10.0.1 alone while the machine listed both mesh resolvers; its copy // of the file could not be read by anything on the mesh. func TestAContainersResolverFileIsReadThroughTheArchiveAndComparedWithTheMachines(t *testing.T) { - inside := "# Generated by Docker Engine.\nnameserver 10.10.0.1\nsearch novox.internal\noptions timeout:1 attempts:2\n" + inside := "# Generated by Docker Engine.\nnameserver 10.10.0.1\nsearch node-c.internal\noptions timeout:1 attempts:2\n" f := (&fake{}).on("docker cp route-proxy:/etc/resolv.conf -", Ran{Stdout: archiveOf(t, tar.Header{Name: "resolv.conf", Typeflag: tar.TypeReg, Mode: 0o644}, inside)}) c := client(f, 1000) @@ -47,7 +47,7 @@ func TestAContainersResolverFileIsReadThroughTheArchiveAndComparedWithTheMachine t.Fatal(err) } rc := got["resolv_conf"].(ResolvConf) - if strings.Join(rc.Nameservers, ",") != "10.10.0.1" || strings.Join(rc.Search, ",") != "novox.internal" || + if strings.Join(rc.Nameservers, ",") != "10.10.0.1" || strings.Join(rc.Search, ",") != "node-c.internal" || strings.Join(rc.Options, ",") != "timeout:1,attempts:2" || rc.Raw != inside { t.Fatalf("parsed: %+v", rc) } diff --git a/modules/fail2ban/cmd/fail2ban-tools/own.go b/modules/fail2ban/cmd/fail2ban-tools/own.go index 24ab9ef4..e4efc573 100644 --- a/modules/fail2ban/cmd/fail2ban-tools/own.go +++ b/modules/fail2ban/cmd/fail2ban-tools/own.go @@ -48,7 +48,7 @@ const ( // the operator's own addresses. fail2ban keeps a file entry in its own form, not as written: it reads // `file:/var/lib/…` and prints it back as `file://var/lib/…` (server/ipdns.py, FileIPAddrSet.__repr__, in 1.1), // in `get ignoreip` and in its `Ignore … by …` lines alike. So the path is compared, with fail2ban's own -// reading of the slashes after `file:`, never the text (seen on ace on 2026-10-13: every jail held the list +// reading of the slashes after `file:`, never the text (seen on node-a on 2026-10-13: every jail held the list // and the watch said none did). func isOurList(word string) bool { path, ok := strings.CutPrefix(strings.TrimSpace(word), "file:") diff --git a/modules/fail2ban/cmd/fail2ban-tools/own_test.go b/modules/fail2ban/cmd/fail2ban-tools/own_test.go index 8a8699f2..47f50629 100644 --- a/modules/fail2ban/cmd/fail2ban-tools/own_test.go +++ b/modules/fail2ban/cmd/fail2ban-tools/own_test.go @@ -16,7 +16,7 @@ import ( ) // asPrinted is the list's entry as fail2ban 1.1 prints it back, in `get ignoreip` and in its log: it reads -// `file:/var/lib/…` and keeps it as `file://var/lib/…` (FileIPAddrSet.__repr__), as ace's daemon printed it on +// `file:/var/lib/…` and keeps it as `file://var/lib/…` (FileIPAddrSet.__repr__), as node-a's daemon printed it on // 2026-10-13. const asPrinted = "file://var/lib/mesh-fail2ban/own-addresses" diff --git a/modules/lemurs/README.md b/modules/lemurs/README.md index 17e2e34a..ba42f681 100644 --- a/modules/lemurs/README.md +++ b/modules/lemurs/README.md @@ -82,7 +82,7 @@ Steps 1, 2 and 3 are harmless in any order. Step 4 waits for `i3`. ## What changes when it is assigned -| | g14 | shanks | +| | node-b | node-d | |---|---|---| | package | nothing until step 1 (`lemurs-git` reads as installed) | the same | | `/etc/lemurs/config.toml` | the found file kept once, then the module's written | the same | diff --git a/modules/mesh-catalog/test/heard.test.ts b/modules/mesh-catalog/test/heard.test.ts index e00daa1b..976cc1a4 100644 --- a/modules/mesh-catalog/test/heard.test.ts +++ b/modules/mesh-catalog/test/heard.test.ts @@ -7,10 +7,10 @@ import { BUILD_EVENTS, placeable } from "../heard.js"; // A walk's build as the build seat says it (mesh-controller's link.BuildResult), here mailu's of novox/hq issue 712. const walkBuild = { id: "build-1791997333800041716", - repository: "http://novox.internal:20000/novox/mesh-catalog.git", + repository: "http://node-c.internal:20000/node-c/mesh-catalog.git", path: "modules/mailu", ref: "main", - on: "shanks", + on: "node-d", trunk: "main", "on-trunk": true, branches: ["main"], diff --git a/modules/xorg/README.md b/modules/xorg/README.md index 5172b801..2ac327d6 100644 --- a/modules/xorg/README.md +++ b/modules/xorg/README.md @@ -180,7 +180,7 @@ bindings. Those bindings belong to that machine's hardware module, not here. ## What changes when it is assigned -| | g14 (laptop) | shanks (desktop) | +| | node-b (laptop) | node-d (desktop) | |---|---|---| | packages | `autorandr` installed; the rest are there already | the same | | files | `~/.config/xorg/xresources` new; a block added at the start of `~/.xinitrc` | the same | diff --git a/modules/xterm/README.md b/modules/xterm/README.md index 61aff57c..1fe55328 100644 --- a/modules/xterm/README.md +++ b/modules/xterm/README.md @@ -53,7 +53,7 @@ program. ## What changes when it is assigned -| | g14 | shanks | +| | node-b | node-d | |---|---|---| | package | none (`xterm` present) | the same | | `xorg`'s resources file | gains this module's resources | the same |