Restore NotifyListen to avoid panic in newServer retry (#6200)

2019-07-23 14:33:00 -06:00 · 2019-07-23 14:33:00 -06:00 · c19f46639b
parent 12d263e6b0
commit c19f46639b
1 changed files with 4 additions and 0 deletions
--- a/agent/consul/server_test.go
+++ b/agent/consul/server_test.go
@ -183,6 +183,10 @@ func newServer(c *Config) (*Server, error) {
 			oldNotify()
 		}
 	}
+	// Restore old notify to guard against re-closing `up` on a retry
+	defer func() {
+		c.NotifyListen = oldNotify
+	}()

 	// start server
 	w := c.LogOutput