deployment watcher: refactoring testing

tgross · tgross · commit e8013a6d6cd5 · 2025-07-15T15:17:43.000-04:00
While investigating whether the deploymentwatcher would need updates to implement system deployments, I discovered that some of the tests are racy and make assertions about called functions without waiting. Update these tests to wait where needed, and generally clean them up while we're in here. Ref: https://hashicorp.atlassian.net/browse/NMD-892
diff --git a/nomad/deploymentwatcher/deployment_watcher.go b/nomad/deploymentwatcher/deployment_watcher.go
@@ -156,7 +156,7 @@ func (w *deploymentWatcher) getDeployment() *structs.Deployment {
 	return w.d
 }
 
-func (w *deploymentWatcher) SetAllocHealth(
+func (w *deploymentWatcher) setAllocHealth(
 	req *structs.DeploymentAllocHealthRequest,
 	resp *structs.DeploymentUpdateResponse) error {
 
diff --git a/nomad/deploymentwatcher/deployments_watcher.go b/nomad/deploymentwatcher/deployments_watcher.go
@@ -374,7 +374,7 @@ func (w *Watcher) SetAllocHealth(req *structs.DeploymentAllocHealthRequest, resp
 		return err
 	}
 
-	return watcher.SetAllocHealth(req, resp)
+	return watcher.setAllocHealth(req, resp)
 }
 
 // PromoteDeployment is used to promote a deployment. If promote is false,
diff --git a/nomad/deploymentwatcher/deployments_watcher_test.go b/nomad/deploymentwatcher/deployments_watcher_test.go

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ func (w deploymentWatcher) getDeployment() structs.Deployment {`
`156`	`156`	`return w.d`
`157`	`157`	`}`
`158`	`158`
`159`		`-func (w *deploymentWatcher) SetAllocHealth(`
	`159`	`+func (w *deploymentWatcher) setAllocHealth(`
`160`	`160`	`req *structs.DeploymentAllocHealthRequest,`
`161`	`161`	`resp *structs.DeploymentUpdateResponse) error {`
`162`	`162`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ func (w Watcher) SetAllocHealth(req structs.DeploymentAllocHealthRequest, resp`
`374`	`374`	`return err`
`375`	`375`	`}`
`376`	`376`
`377`		`- return watcher.SetAllocHealth(req, resp)`
	`377`	`+ return watcher.setAllocHealth(req, resp)`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`// PromoteDeployment is used to promote a deployment. If promote is false,`