diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/compositionstep.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/compositionstep.go index ab2c8fd9..fb8a4aa7 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/compositionstep.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/compositionstep.go @@ -124,7 +124,7 @@ func (c *compositionSteps) say1(ctx context.Context, id string, run meshwants.St stopWait() }() phase := &stepPhase{phase: meshwants.StepProgressEventPhaseFetch} - stop := c.sayProgress(id, run.Asker, phase) + stop := c.sayProgress(id, "", phase) // no asker known: the callers lists go (design 47 H §752, H-A-66) o := how(context.WithValue(ctx, phaseKey{}, phase), id, run) stop() if ctx.Err() != nil { diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/compositionstep_test.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/compositionstep_test.go index ee2541c1..48dcfbfb 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/compositionstep_test.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/compositionstep_test.go @@ -96,8 +96,7 @@ func TestARunningCompositionStepSaysItsProgress(t *testing.T) { <-release return stepOutcome{Outcome: meshwants.StepEndedOutcomePassed} }} - // A11/AC1 (design 47 H §752, H-A-88): with no callers in mesh-wants, the progress names the asker the step run carries. - body, _ := json.Marshal(meshwants.StepRun{Pipeline: "main.4", Step: meshwants.StepRunStepComposition, Module: "m", Branch: "main", Asker: "mesh-pipeline-runner"}) + body, _ := json.Marshal(meshwants.StepRun{Pipeline: "main.4", Step: meshwants.StepRunStepComposition, Module: "m", Branch: "main"}) if !c.take(context.Background(), "ask-1", body) { t.Fatal("the composition step is not taken") } @@ -111,7 +110,7 @@ func TestARunningCompositionStepSaysItsProgress(t *testing.T) { said.mu.Lock() p, ok := said.said[progress].(meshwants.StepProgressEvent) said.mu.Unlock() - if !ok || p.Ask != "ask-1" || p.Asker != "mesh-pipeline-runner" || p.Phase != meshwants.StepProgressEventPhaseRun || !p.At.Equal(at) || + if !ok || p.Ask != "ask-1" || p.Asker != "" || p.Phase != meshwants.StepProgressEventPhaseRun || !p.At.Equal(at) || len(p.Shared) != 1 || p.Shared[0].Ask != "run-1" { // the runs the step waits on (§723) t.Fatalf("step-progress %+v", p) }