Assert the next compose carries the issued account, not a stand-in (issue 1226, review round 2)
mesh/merge-gate head 181b579ac6ea merged into trunk 22c9815f6522 — pass: builds mesh-controller → novox; no bus step; every machine composes with the chang…
mesh/repo-check head 181b579ac6ea merged into trunk 22c9815f6522 — pass: its merge-check.sh passed
mesh/delivery delivered
mesh/merge-gate head 181b579ac6ea merged into trunk 22c9815f6522 — pass: builds mesh-controller → novox; no bus step; every machine composes with the chang…
mesh/repo-check head 181b579ac6ea merged into trunk 22c9815f6522 — pass: its merge-check.sh passed
mesh/delivery delivered
This commit is contained in:
@@ -10,8 +10,10 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.novox.be/novox/mesh-sdk/go/catalogue"
|
"git.novox.be/novox/mesh-sdk/go/catalogue"
|
||||||
|
"git.novox.be/novox/mesh-sdk/go/compose"
|
||||||
|
|
||||||
"github.com/novox/mesh-controller/internal/broker"
|
"github.com/novox/mesh-controller/internal/broker"
|
||||||
|
"github.com/novox/mesh-controller/internal/inventory"
|
||||||
"github.com/novox/mesh-controller/internal/link"
|
"github.com/novox/mesh-controller/internal/link"
|
||||||
"github.com/novox/mesh-controller/internal/testbus"
|
"github.com/novox/mesh-controller/internal/testbus"
|
||||||
)
|
)
|
||||||
@@ -75,8 +77,23 @@ func TestAGainedProcessIsIssuedWhenTheDeliveryRecordsIt(t *testing.T) {
|
|||||||
if strings.Contains(said.String(), "bus account is not issued") {
|
if strings.Contains(said.String(), "bus account is not issued") {
|
||||||
t.Fatalf("1226/AC2: the next compose warns of an account just minted: %q", said.String())
|
t.Fatalf("1226/AC2: the next compose warns of an account just minted: %q", said.String())
|
||||||
}
|
}
|
||||||
if _, held, err := inv.ModuleSecretIfIssued(ctx, "laptop", "mesh-mail", "broker-send"); err != nil || !held {
|
// The row the compose reads is the account issueProcess accepted (origin accepted), never a value the mesh
|
||||||
t.Fatalf("1226/AC2: the next compose carries no account for the process: held %v, %v", held, err)
|
// made for it (a stand-in).
|
||||||
|
in, err := inputFor(ctx, open)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var row *compose.OwnSecretRow
|
||||||
|
for i, r := range in.OwnSecrets {
|
||||||
|
if r.Node == "laptop" && r.Module == "mesh-mail" && r.Name == "broker-send" {
|
||||||
|
row = &in.OwnSecrets[i]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if row == nil {
|
||||||
|
t.Fatal("1226/AC2: the next compose carries no row for the process's account")
|
||||||
|
}
|
||||||
|
if row.Origin != inventory.OriginAccepted {
|
||||||
|
t.Fatalf("1226/AC2: the process's account is a stand-in the mesh made (origin %q), not the issued account", row.Origin)
|
||||||
}
|
}
|
||||||
build("b-2", "bbbbbbb2222")
|
build("b-2", "bbbbbbb2222")
|
||||||
again, _, err := inv.BusUserHash(ctx, "laptop.mesh-mail.send")
|
again, _, err := inv.BusUserHash(ctx, "laptop.mesh-mail.send")
|
||||||
|
|||||||
Reference in New Issue
Block a user