diff --git a/internal/catalogue/ssh_client_test.go b/internal/catalogue/ssh_client_test.go index 06ef03ca..7ed6b215 100644 --- a/internal/catalogue/ssh_client_test.go +++ b/internal/catalogue/ssh_client_test.go @@ -11,9 +11,16 @@ import ( // whole of ~/.ssh/config.d/00-mesh, every other node with its account. ~/.ssh and ~/.ssh/config.d // are created 0700 and owned by the account; the operator's own config below the region is kept. func TestSSHClientOwnsTheOperatorsSSHConfig(t *testing.T) { - shelf := shelf(catalogueManifest(t, "ssh-client")) + shelf := shelf(catalogueManifest(t, "ssh-client"), catalogueManifest(t, "gitea")) + // ssh-client requires forge-account since mesh-catalog #340 (novox/hq issue 955), answered by the forge's + // holder on another node; this test is about the operator's config, so the forge is offered from there + // (issue 985). + forge := World{Offered: map[string][]Provider{ + "forge-account": {{Node: "marge", At: "marge.internal", Module: "gitea", Serves: map[string]any{ + "ssh_host": "marge.internal", "ssh_port": 222, "known_host": "[marge.internal]:222 ssh-ed25519 AAAA", + "ssh_base": "ssh://git@marge.internal:222/", "https_base": "https://git.example.org/"}}}}} got, err := Resolve(shelf, []string{"ssh-client"}, - Node{Name: "homer", At: "homer.internal", Account: "jo", AccountHome: "/home/jo"}, World{}) + Node{Name: "homer", At: "homer.internal", Account: "jo", AccountHome: "/home/jo"}, forge) if err != nil { t.Fatal(err) }