tests: make testagent shutdown idempotent

Avoid double freeing ports if an agent.Shutdown() is called multiple
times.
This commit is contained in:
Mahmood Ali 2020-07-03 09:16:01 -04:00
parent 76e2e38e40
commit 329969b97e

View file

@ -84,6 +84,9 @@ type TestAgent struct {
// Enterprise specifies if the agent is enterprise or not
Enterprise bool
// shutdown is set to true if agent has been shutdown
shutdown bool
}
// NewTestAgent returns a started agent with the given name and
@ -259,6 +262,11 @@ func (a *TestAgent) start() (*Agent, error) {
// Shutdown stops the agent and removes the data directory if it is
// managed by the test agent.
func (a *TestAgent) Shutdown() error {
if a.shutdown {
return nil
}
a.shutdown = true
defer freeport.Return(a.ports)
defer func() {