novox/mesh-lab
3
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Assign the resolver configuration module that suits the machine

Browse Source 
These machines run systemd-resolved, so resolv-conf would fight it over the
file. Both claim the-resolver-configuration so that assigning the wrong one is
refused rather than fought over — and the test was picking the wrong one.
This commit is contained in:
jschoubben
2026-08-31 13:39:58 +02:00
parent a6480bbd88
commit a83f6b7f8e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration/mesh.test.ts
+7 -3
View File
@@ -1375,7 +1375,11 @@ test("a service is reached by a name under the machine it runs on", {
// //
// The mesh writes the data; a module runs the daemon. Both manifests are read from the // The mesh writes the data; a module runs the daemon. Both manifests are read from the
// repository rather than written here, so what is proven is what ships. // repository rather than written here, so what is proven is what ships.
for (const name of ["dnsmasq", "resolv-conf"]) { // `resolved-split-dns`, not `resolv-conf`: these machines run systemd-resolved, which owns
// /etc/resolv.conf. The two claim the same thing precisely so that assigning the wrong one is a
// refusal rather than a fight over the file — and picking the wrong one here would have been
// testing that fight.
for (const name of ["dnsmasq", "resolved-split-dns"]) {
const manifest = readFileSync(`${moduleExamples}/${name}.json`, "utf8"); const manifest = readFileSync(`${moduleExamples}/${name}.json`, "utf8");
await must("anchor", `cat > /tmp/${name}.json <<'MANIFEST'\n${manifest}\nMANIFEST`); await must("anchor", `cat > /tmp/${name}.json <<'MANIFEST'\n${manifest}\nMANIFEST`);
await must("anchor", `docker cp /tmp/${name}.json mesh-control:/${name}.json`); await must("anchor", `docker cp /tmp/${name}.json mesh-control:/${name}.json`);
@@ -1387,7 +1391,7 @@ test("a service is reached by a name under the machine it runs on", {
// does, which is the arrangement this design refuses everywhere else. // does, which is the arrangement this design refuses everywhere else.
for (const machine of ["anchor", "laptop"]) { for (const machine of ["anchor", "laptop"]) {
await mesh(`assign ${machine} dnsmasq`); await mesh(`assign ${machine} dnsmasq`);
await mesh(`assign ${machine} resolv-conf`); await mesh(`assign ${machine} resolved-split-dns`);
} }
await mesh("push"); await mesh("push");
await new Promise((r) => setTimeout(r, 25_000)); await new Promise((r) => setTimeout(r, 25_000));
@@ -1454,7 +1458,7 @@ test("a service is reached by a name under the machine it runs on", {
"the resolver answered for a name that is not the mesh's"); "the resolver answered for a name that is not the mesh's");
for (const machine of ["anchor", "laptop"]) { for (const machine of ["anchor", "laptop"]) {
await mesh(`unassign ${machine} resolv-conf`); await mesh(`unassign ${machine} resolved-split-dns`);
await mesh(`unassign ${machine} dnsmasq`); await mesh(`unassign ${machine} dnsmasq`);
} }
await mesh("push"); await mesh("push");