2 files changed, 32 insertions, 5 deletions
diff --git a/core/connection.go b/core/connection.go
index 1bfcae5..f796f3d 100644
--- a/core/connection.go
+++ b/core/connection.go
@@ -216,14 +216,18 @@ func (c *Connection) Disconnect() {
 		return
 	}
 	if c.vppClient != nil {
-		c.disconnectVPP()
+		c.disconnectVPP(true)
 	}
 }
 
-// disconnectVPP disconnects from VPP in case it is connected.
-func (c *Connection) disconnectVPP() {
+// disconnectVPP disconnects from VPP in case it is connected. terminate tells
+// that disconnectVPP() was called from Close(), so healthCheckLoop() can be
+// terminated.
+func (c *Connection) disconnectVPP(terminate bool) {
 	if atomic.CompareAndSwapUint32(&c.vppConnected, 1, 0) {
-		close(c.healthCheckDone)
+		if terminate {
+			close(c.healthCheckDone)
+		}
 		log.Debug("Disconnecting from VPP..")
 
 		if err := c.vppClient.Disconnect(); err != nil {
@@ -383,7 +387,7 @@ HealthCheck:
 	}
 
 	// cleanup
-	c.disconnectVPP()
+	c.disconnectVPP(false)
 
 	// we are now disconnected, start connect loop
 	c.connectLoop()
diff --git a/core/connection_test.go b/core/connection_test.go
index 230eea5..81b145c 100644
--- a/core/connection_test.go
+++ b/core/connection_test.go
@@ -16,6 +16,7 @@ package core_test
 
 import (
 	"testing"
+	"time"
 
 	. "github.com/onsi/gomega"
 
@@ -91,6 +92,28 @@ func TestAsyncConnection(t *testing.T) {
 	Expect(ev.State).Should(BeEquivalentTo(core.Connected))
 }
 
+func TestAsyncConnectionProcessesVppTimeout(t *testing.T) {
+	ctx := setupTest(t, false)
+	defer ctx.teardownTest()
+
+	ctx.conn.Disconnect()
+	conn, statusChan, err := core.AsyncConnect(ctx.mockVpp, core.DefaultMaxReconnectAttempts, core.DefaultReconnectInterval)
+	ctx.conn = conn
+
+	Expect(err).ShouldNot(HaveOccurred())
+	Expect(conn).ShouldNot(BeNil())
+
+	ev := <-statusChan
+	Expect(ev.State).Should(BeEquivalentTo(core.Connected))
+
+	// make control ping reply fail so that connection.healthCheckLoop()
+	// initiates reconnection.
+	ctx.mockVpp.MockReply(&vpe.ControlPingReply{
+		Retval: -1,
+	})
+	time.Sleep(time.Duration(1+core.HealthCheckThreshold) * (core.HealthCheckInterval + 2*core.HealthCheckReplyTimeout))
+}
+
 func TestCodec(t *testing.T) {
 	RegisterTestingT(t)