Thales Maciel
ecb18ce6ca
Three test seams were still package-level mutable vars, which tests
had to swap before use. That's the classic path to flaky parallel
tests — two goroutines fighting over the same global fake. Push each
down to the struct that owns the behaviour.
internal/daemon/dns_routing.go
lookupExecutableFunc + vmDNSAddrFunc → fields on *HostNetwork,
defaulted at newHostNetwork time. dns_routing_test builds
HostNetwork{..., lookupExecutable: stub, vmDNSAddr: stub} inline,
no more t.Cleanup dance around package-level vars.
internal/daemon/preflight.go + doctor.go
vsockHostDevicePath (mutable string) → vsockHostDevice field on
*VMService, defaulted via defaultVsockHostDevice constant in
newVMService. Preflight reads s.vsockHostDevice; doctor reads
d.vm.vsockHostDevice. Logger test sets d.vm.vsockHostDevice = tmp
after wireServices.
internal/daemon/workspace/workspace.go
HostCommandOutputFunc → *Inspector struct with a Runner field.
Every git-using helper (GitOutput, GitTrimmedOutput,
GitResolvedConfigValue, RunHostCommand, ListSubmodules,
ListOverlayPaths, CountUntrackedPaths, InspectRepo,
ImportRepoToGuest, PrepareRepoCopy) is now a method on *Inspector.
NewInspector() wraps the real host runner for production;
WorkspaceService holds one via repoInspector, CLI deps holds one
too. cli_test.go's submodule-rejection test builds its own
Inspector with a scripted Runner instead of patching a global.
Pure helpers (FinalizeScript, ResolveSourcePath, ParsePrepareMode,
ShellQuote, FormatStepError, GitFileURL, ParseNullSeparatedOutput)
stay free functions since they don't touch the host.
Sentinel: grep for HostCommandOutputFunc, lookupExecutableFunc,
vmDNSAddrFunc, vsockHostDevicePath is now empty across internal/.
make lint test green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
62 lines
1.8 KiB
Go
62 lines
1.8 KiB
Go
package daemon
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"banger/internal/model"
|
|
"banger/internal/vmdns"
|
|
)
|
|
|
|
func TestSyncVMDNSResolverRoutingConfiguresResolved(t *testing.T) {
|
|
runner := &scriptedRunner{
|
|
t: t,
|
|
steps: []runnerStep{
|
|
{call: runnerCall{name: "ip", args: []string{"link", "show", model.DefaultBridgeName}}, out: []byte("1: br-fc\n")},
|
|
sudoStep("", nil, "resolvectl", "dns", model.DefaultBridgeName, "127.0.0.1:42069"),
|
|
sudoStep("", nil, "resolvectl", "domain", model.DefaultBridgeName, vmResolverRouteDomain),
|
|
sudoStep("", nil, "resolvectl", "default-route", model.DefaultBridgeName, "no"),
|
|
},
|
|
}
|
|
cfg := model.DaemonConfig{BridgeName: model.DefaultBridgeName}
|
|
n := &HostNetwork{
|
|
runner: runner, config: cfg, vmDNS: new(vmdns.Server),
|
|
lookupExecutable: func(name string) (string, error) {
|
|
if name == "resolvectl" {
|
|
return "/usr/bin/resolvectl", nil
|
|
}
|
|
return "", nil
|
|
},
|
|
vmDNSAddr: func(*vmdns.Server) string { return "127.0.0.1:42069" },
|
|
}
|
|
|
|
if err := n.syncVMDNSResolverRouting(context.Background()); err != nil {
|
|
t.Fatalf("syncVMDNSResolverRouting: %v", err)
|
|
}
|
|
runner.assertExhausted()
|
|
}
|
|
|
|
func TestClearVMDNSResolverRoutingRevertsBridgeConfig(t *testing.T) {
|
|
runner := &scriptedRunner{
|
|
t: t,
|
|
steps: []runnerStep{
|
|
{call: runnerCall{name: "ip", args: []string{"link", "show", model.DefaultBridgeName}}, out: []byte("1: br-fc\n")},
|
|
sudoStep("", nil, "resolvectl", "revert", model.DefaultBridgeName),
|
|
},
|
|
}
|
|
cfg := model.DaemonConfig{BridgeName: model.DefaultBridgeName}
|
|
n := &HostNetwork{
|
|
runner: runner, config: cfg,
|
|
lookupExecutable: func(name string) (string, error) {
|
|
if name == "resolvectl" {
|
|
return "/usr/bin/resolvectl", nil
|
|
}
|
|
return "", nil
|
|
},
|
|
}
|
|
|
|
if err := n.clearVMDNSResolverRouting(context.Background()); err != nil {
|
|
t.Fatalf("clearVMDNSResolverRouting: %v", err)
|
|
}
|
|
runner.assertExhausted()
|
|
}
|