Fix race in tests

kylecarbs · kylecarbs · commit 09e87b0aa06d · 2022-10-15T06:57:46.000Z
diff --git a/tailnet/coordinator.go b/tailnet/coordinator.go
@@ -310,7 +310,6 @@ func (c *coordinator) handleNextAgentMessage(id uuid.UUID, decoder *json.Decoder
 		c.mutex.Unlock()
 		return nil
 	}
-	c.mutex.Unlock()
 	data, err := json.Marshal([]*Node{&node})
 	if err != nil {
 		return xerrors.Errorf("marshal nodes: %w", err)
@@ -328,6 +327,7 @@ func (c *coordinator) handleNextAgentMessage(id uuid.UUID, decoder *json.Decoder
 		}()
 	}
 
+	c.mutex.Unlock()
 	wg.Wait()
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,6 @@ func (c coordinator) handleNextAgentMessage(id uuid.UUID, decoder json.Decoder`
`310`	`310`	`c.mutex.Unlock()`
`311`	`311`	`return nil`
`312`	`312`	`}`
`313`		`- c.mutex.Unlock()`
`314`	`313`	`data, err := json.Marshal([]*Node{&node})`
`315`	`314`	`if err != nil {`
`316`	`315`	`return xerrors.Errorf("marshal nodes: %w", err)`
`@@ -328,6 +327,7 @@ func (c coordinator) handleNextAgentMessage(id uuid.UUID, decoder json.Decoder`
`328`	`327`	`}()`
`329`	`328`	`}`
`330`	`329`
	`330`	`+ c.mutex.Unlock()`
`331`	`331`	`wg.Wait()`
`332`	`332`	`return nil`
`333`	`333`	`}`