tests: fix disconnect handling

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>

test/ovs/ovs_integration_test.go

@@ -156,25 +156,27 @@ func (suite *OVSIntegrationSuite) TestConnectReconnect() {
 	err = suite.client.Connect(ctx)
 	require.NoError(suite.T(), err)
 
+	// set up a disconnect notification
 	disconnectNotification := suite.client.DisconnectNotify()
-	notified := make(chan struct{})
 	ready := make(chan struct{})
 
 	go func() {
-		ready <- struct{}{}
-		<-disconnectNotification
-		notified <- struct{}{}
+		<-ready
+		suite.client.Close()
 	}()
 
-	<-ready
-	suite.client.Disconnect()
-
-	select {
-	case <-notified:
-		// got notification
-	case <-time.After(5 * time.Second):
-		suite.T().Fatal("expected a disconnect notification but didn't receive one")
-	}
+	func() {
+		for {
+			select {
+			case ready <- struct{}{}:
+			case <-disconnectNotification:
+				// got notification
+				return
+			case <-time.After(5 * time.Second):
+				suite.T().Fatal("expected a disconnect notification but didn't receive one")
+			}
+		}
+	}()
 
 	assert.Equal(suite.T(), false, suite.client.Connected())
 
@@ -293,39 +295,40 @@ func (suite *OVSIntegrationSuite) TestWithReconnect() {
 	_, err = suite.createBridge(bridgeName)
 	require.NoError(suite.T(), err)
 
-LOOP:
-	for {
-		select {
-		case <-time.After(5 * time.Second):
-			suite.T().Fatal("timed out waiting for bridge")
-		case b := <-brChan:
-			if b.Name == bridgeName {
-				break LOOP
+	func() {
+		for {
+			select {
+			case <-time.After(5 * time.Second):
+				suite.T().Fatal("timed out waiting for bridge")
+			case b := <-brChan:
+				if b.Name == bridgeName {
+					return
+				}
 			}
 		}
-	}
+	}()
 
 	// set up a disconnect notification
 	disconnectNotification := suite.client.DisconnectNotify()
-	notified := make(chan struct{})
 	ready := make(chan struct{})
 
 	go func() {
-		ready <- struct{}{}
-		<-disconnectNotification
-		notified <- struct{}{}
+		<-ready
+		suite.client.Close()
 	}()
 
-	<-ready
-	// close the connection
-	suite.client.Close()
-
-	select {
-	case <-notified:
-		// got notification
-	case <-time.After(5 * time.Second):
-		suite.T().Fatal("expected a disconnect notification but didn't receive one")
-	}
+	func() {
+		for {
+			select {
+			case ready <- struct{}{}:
+			case <-disconnectNotification:
+				// got notification
+				return
+			case <-time.After(5 * time.Second):
+				suite.T().Fatal("expected a disconnect notification but didn't receive one")
+			}
+		}
+	}()
 
 	assert.Equal(suite.T(), false, suite.client.Connected())