novox/mesh-host
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'The own resolver's test reads the options from the catalog's template (issue 1748, ADR 0678)' (#225) from fix/1748-resolver-wait into main

Browse Source
This commit was merged in pull request #225.
This commit is contained in:
mesh-tools
2026-11-12 17:52:54 +00:00
parent df1412081b 8dc186944e
commit 0193949efe
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/compose/resolution/node_resolver_test.go
+11 -1
View File
@@ -151,6 +151,16 @@ func TestTheCataloguesResolverHoldersWriteTheFileAndProvideSplitDNS(t *testing.T
func TestTheCataloguesResolverComposesOnAMachine(t *testing.T) { func TestTheCataloguesResolverComposesOnAMachine(t *testing.T) {
shelf := resolverShelf(t) shelf := resolverShelf(t)
shelf["systemd-resolved"] = catalogueManifest(t, "systemd-resolved") shelf["systemd-resolved"] = catalogueManifest(t, "systemd-resolved")
// The options line is the catalogue's own template's, never a literal of it here (design 50 resolver-wait §3).
options := ""
for _, l := range strings.Split(shelf["systemd-resolved"].Facts["resolvers"].Template, "\n") {
if strings.HasPrefix(l, "options ") {
options = l
}
}
if options == "" {
t.Fatal("the catalogue's resolver template has no options line")
}
got, err := Resolve(shelf, []string{"dnsmasq", "systemd-networkd", "systemd-resolved"}, splitDNSLaptop(), mcat.World{}) got, err := Resolve(shelf, []string{"dnsmasq", "systemd-networkd", "systemd-resolved"}, splitDNSLaptop(), mcat.World{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@@ -166,7 +176,7 @@ func TestTheCataloguesResolverComposesOnAMachine(t *testing.T) {
ids := byID(out) ids := byID(out)
resolv, _ := ids["systemd-resolved.fact-resolvers"]["content"].(string) resolv, _ := ids["systemd-resolved.fact-resolvers"]["content"].(string)
kept, _ := ids["systemd-resolved.fact-kept"]["content"].(string) kept, _ := ids["systemd-resolved.fact-kept"]["content"].(string)
if !strings.Contains(resolv, "\nnameserver 10.42.0.2\noptions timeout:1 attempts:2 edns0\n") || resolv != kept { if !strings.Contains(resolv, "\nnameserver 10.42.0.2\n"+options+"\n") || resolv != kept {
t.Errorf("the resolver file does not name this machine's own resolver alone, or its copy differs:\n%s", resolv) t.Errorf("the resolver file does not name this machine's own resolver alone, or its copy differs:\n%s", resolv)
} }
if ids["systemd-networkd.fact-resolvers"] != nil { if ids["systemd-networkd.fact-resolvers"] != nil {