Merge pull request 'Phase 5 (3/4): every test on a bus of its own, at the release the mesh runs (hq ADR 0237)' (#97) from feat/a-suite-that-cannot-flake into main

cmd/mesh-controller/busobjects_test.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"errors"
-	"os"
 	"strings"
 	"testing"
 
@@ -12,6 +11,8 @@ import (
 	"github.com/novox/mesh-controller/internal/catalogue"
 	"github.com/novox/mesh-controller/internal/inventory"
 	"github.com/novox/mesh-controller/internal/link"
+
+	"github.com/novox/mesh-controller/internal/testbus"
 )
 
 // novox/hq issue 208: the bus's objects a declaration implies are asserted whenever one is sent, not
@@ -158,10 +159,7 @@ func TestASendThatCannotAssertTheBusSaysSoAndRaisesACondition(t *testing.T) {
 // Against a real bus, through the send's own grant: a module assigned after start has its consumer
 // once a declaration is sent, and a holder assigned after start its seat's worker.
 func TestNatsAModuleAssignedAfterStartGetsItsConsumerAtItsFirstSend(t *testing.T) {
-	url := os.Getenv("MESH_TEST_NATS")
-	if url == "" {
-		t.Skip("MESH_TEST_NATS unset")
-	}
+	url := testbus.URL(t)
 	open := aMesh(t)
 	js, err := broker.Dial(url)
 	if err != nil {

cmd/mesh-controller/data_test.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"encoding/json"
-	"os"
 	"strings"
 	"sync"
 	"testing"
@@ -17,6 +16,8 @@ import (
 	"github.com/novox/mesh-controller/internal/catalogue"
 	"github.com/novox/mesh-controller/internal/conditions"
 	"github.com/novox/mesh-controller/internal/inventory"
+
+	"github.com/novox/mesh-controller/internal/testbus"
 )
 
 func bytesOf(n int64) *int64 { return &n }
@@ -305,7 +306,7 @@ func TestNatsUnassigningIrreplaceableDataRetiresItAndAnEmptyReplacementIsUrgent(
 	}
 
 	conn := onATestBus(t)
-	js, err := broker.Dial(os.Getenv("MESH_TEST_NATS"))
+	js, err := broker.Dial(testbus.URL(t))
 	if err != nil {
 		t.Fatal(err)
 	}

cmd/mesh-controller/doctor_test.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"net"
-	"os"
 	"slices"
 	"strings"
 	"sync/atomic"
@@ -20,6 +19,8 @@ import (
 	"github.com/novox/mesh-controller/internal/catalogue"
 	"github.com/novox/mesh-controller/internal/conditions"
 	"github.com/novox/mesh-controller/internal/link"
+
+	"github.com/novox/mesh-controller/internal/testbus"
 )
 
 // The self-check (novox/hq to-be 45 §4): a probe that fails raises its condition, one that cannot run
@@ -250,10 +251,7 @@ func TestAResolverAnsweringNoSuchNameForIPv6IsWrong(t *testing.T) {
 // **D6, D7: what the controller defines is what it finds**, and a consumer deleted or a stream
 // redefined is said — against a real bus, raised by the same derivation the controller starts with.
 func TestNatsTheBusIsWhatTheControllerDefines(t *testing.T) {
-	url := os.Getenv("MESH_TEST_NATS")
-	if url == "" {
-		t.Skip("MESH_TEST_NATS unset")
-	}
+	url := testbus.URL(t)
 	open := aMesh(t)
 	js, err := broker.Dial(url)
 	if err != nil {
@@ -300,10 +298,7 @@ func TestNatsTheBusIsWhatTheControllerDefines(t *testing.T) {
 
 // **S9 hears the bus**: a consumer that gives up on a message, and one deleted, as the server says.
 func TestNatsTheBusSaysAConsumerGaveUpAndOneWasDeleted(t *testing.T) {
-	url := os.Getenv("MESH_TEST_NATS")
-	if url == "" {
-		t.Skip("MESH_TEST_NATS unset")
-	}
+	url := testbus.URL(t)
 	conn, err := nats.Connect(url)
 	if err != nil {
 		t.Fatal(err)

cmd/mesh-controller/healers_test.go

@@ -18,6 +18,8 @@ import (
 	"github.com/novox/mesh-controller/internal/conditions"
 	"github.com/novox/mesh-controller/internal/inventory"
 	"github.com/novox/mesh-controller/internal/link"
+
+	"github.com/novox/mesh-controller/internal/testbus"
 )
 
 // The test generated from the healer registry (novox/hq to-be 45 §7, ADR 0227 rule 7 "how it is
@@ -434,10 +436,7 @@ func TestH4ResetsOnlyWhatTheTableMarksResettable(t *testing.T) {
 // asserts the bus's objects the way a send does, and D6's next run clears it — the healer never does.
 // Deleted again within the hour, the budget is spent: the operator's, urgent, and H3 stops.
 func TestNatsH3AssertsAMissingConsumerAgainAndBrakesAfterItsBudget(t *testing.T) {
-	url := os.Getenv("MESH_TEST_NATS")
-	if url == "" {
-		t.Skip("MESH_TEST_NATS unset")
-	}
+	url := testbus.URL(t)
 	open := aMesh(t)
 	ctx := t.Context()
 	js, err := broker.Dial(url)
@@ -530,10 +529,7 @@ func TestNatsH3AssertsAMissingConsumerAgainAndBrakesAfterItsBudget(t *testing.T)
 // once replayed — is re-made from now by the mesh itself, and the controller's bound subscription still
 // receives what comes next: a reset that left the controller deaf would be the incident.
 func TestNatsH4ResetsTheControllersEventsConsumerAndItStillDelivers(t *testing.T) {
-	url := os.Getenv("MESH_TEST_NATS")
-	if url == "" {
-		t.Skip("MESH_TEST_NATS unset")
-	}
+	url := testbus.URL(t)
 	open := aMesh(t)
 	ctx := t.Context()
 	js, err := broker.Dial(url)
@@ -619,10 +615,7 @@ func TestNatsH4ResetsTheControllersEventsConsumerAndItStillDelivers(t *testing.T
 
 // **H1's question reaches the machine**, on the subject its grant lets it hear and nothing else.
 func TestNatsAskToReportReachesTheMachine(t *testing.T) {
-	url := os.Getenv("MESH_TEST_NATS")
-	if url == "" {
-		t.Skip("MESH_TEST_NATS unset")
-	}
+	url := testbus.URL(t)
 	conn, err := nats.Connect(url)
 	if err != nil {
 		t.Fatal(err)

cmd/mesh-controller/lease_test.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"errors"
-	"os"
 	"testing"
 	"time"
 
@@ -14,6 +13,8 @@ import (
 	"github.com/novox/mesh-controller/internal/conditions"
 	"github.com/novox/mesh-controller/internal/inventory"
 	"github.com/novox/mesh-controller/internal/lease"
+
+	"github.com/novox/mesh-controller/internal/testbus"
 )
 
 // Two controllers at once (novox/hq to-be 45 §6, issue 204; the half of replay R1 that lives here): two
@@ -22,15 +23,12 @@ import (
 // one that lost it acts no more — no declaration composed, no plan and no condition written — the
 // moment it lost it.
 //
-//	MESH_TEST_POSTGRES=… MESH_TEST_NATS=nats://127.0.0.1:14222 go test ./cmd/mesh-controller/ -run Controllers
+//	MESH_TEST_POSTGRES=… go test ./cmd/mesh-controller/ -run Controllers   (each test on a bus of its own: internal/testbus)
 
 // aBusForTheLease is the test bus with the controller's lease bucket new.
 func aBusForTheLease(t *testing.T) (string, jetstream.KeyValue) {
 	t.Helper()
-	url := os.Getenv("MESH_TEST_NATS")
-	if url == "" {
-		t.Skip("MESH_TEST_NATS unset")
-	}
+	url := testbus.URL(t)
 	conn, err := nats.Connect(url)
 	if err != nil {
 		t.Fatal(err)

cmd/mesh-controller/queue_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"os"
 	"reflect"
 	"strings"
 	"testing"
@@ -16,15 +15,15 @@ import (
 	"github.com/novox/mesh-controller/internal/catalogue"
 	"github.com/novox/mesh-controller/internal/inventory"
 	"github.com/novox/mesh-controller/internal/link"
+
+	"github.com/novox/mesh-controller/internal/testbus"
 )
 
 // The build queue, controlled by hand (novox/hq ADR 0219), and the plans that follow it.
 //
-//	docker run -d --rm --name bq-nats -p 14294:4222 nats:2.10-alpine -js
 //	make postgres PG_PORT=55566 PG_CONTAINER=bq-pg
-//	MESH_TEST_NATS=nats://127.0.0.1:14294 \
 //	MESH_TEST_POSTGRES='postgres://postgres:check@127.0.0.1:55566/postgres?sslmode=disable' \
-//	  go test ./cmd/mesh-controller/ -run 'Queue|Cancel|Clear|Retry|Rebuild|Replay|Paused'
+//	  go test ./cmd/mesh-controller/ -run 'Queue|Cancel|Clear|Retry|Rebuild|Replay|Paused'   (each test on a bus of its own)
 
 // asksRecorded makes every ask a plan makes return the next id in a row, and says which were asked.
 func asksRecorded(t *testing.T) *[]string {
@@ -357,10 +356,7 @@ func TestTheQueueVerbsRunTheirCommands(t *testing.T) {
 // pointed at it, and a function that asks the seat one build.
 func aBuildQueue(t *testing.T) (*broker.JetStream, func(id, repository string) link.BuildRequest) {
 	t.Helper()
-	url := os.Getenv("MESH_TEST_NATS")
-	if url == "" {
-		t.Skip("MESH_TEST_NATS unset")
-	}
+	url := testbus.URL(t)
 	t.Setenv(broker.NATSVar, url)
 	js, err := broker.Dial(url)
 	if err != nil {

cmd/mesh-controller/retirement_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"flag"
-	"os"
 	"slices"
 	"sort"
 	"strings"
@@ -18,6 +17,8 @@ import (
 	"github.com/novox/mesh-controller/internal/catalogue"
 	"github.com/novox/mesh-controller/internal/conditions"
 	"github.com/novox/mesh-controller/internal/link"
+
+	"github.com/novox/mesh-controller/internal/testbus"
 )
 
 // A consumer the mesh stops asking for is retired, not withdrawn, and deleted only by a person
@@ -261,10 +262,7 @@ func (f *fakeProvider) serve(t *testing.T, conn *nats.Conn, module, node string)
 
 func onATestBus(t *testing.T) *nats.Conn {
 	t.Helper()
-	url := os.Getenv("MESH_TEST_NATS")
-	if url == "" {
-		t.Skip("MESH_TEST_NATS unset")
-	}
+	url := testbus.URL(t)
 	js, err := broker.Dial(url)
 	if err != nil {
 		t.Fatal(err)