test: check xds update more stable.

Signed-off-by: doujiang24 <doujiang24@gmail.com>

Author: doujiang24

api/plugins/tests/integration/controlplane/control_plane.go

@@ -218,9 +218,10 @@ func (cp *ControlPlane) useGoPluginConfig(t *testing.T, config *filtermanager.Fi
 		}
 	}
 
+	detectorRouteName := getRandomString(8)
 	defaultRoutes := []*route.Route{
 		{
-			Name: getRandomString(8),
+			Name: detectorRouteName,
 			Match: &route.RouteMatch{
 				PathSpecifier: &route.RouteMatch_Path{
 					Path: "/detect_if_the_rds_takes_effect",
@@ -286,7 +287,7 @@ func (cp *ControlPlane) useGoPluginConfig(t *testing.T, config *filtermanager.Fi
 
 	if willTimeout {
 		time.Sleep(1 * time.Second)
-		require.False(t, dp.Configured())
+		require.False(t, dp.Configured(detectorRouteName))
 
 		cp.updateConfig(t, Resources{
 			resource.RouteType: []types.Resource{
@@ -306,7 +307,7 @@ func (cp *ControlPlane) useGoPluginConfig(t *testing.T, config *filtermanager.Fi
 
 	// Wait for DP to use the configuration.
 	require.Eventually(t, func() bool {
-		return dp.Configured()
+		return dp.Configured(detectorRouteName)
 	}, 10*time.Second, 50*time.Millisecond, "failed to wait for DP to use the configuration")
 }
 

api/plugins/tests/integration/dataplane/data_plane.go

@@ -58,8 +58,6 @@ type DataPlane struct {
 	opt  *Option
 	done chan error
 
-	latestRouteVersion string
-
 	dataPlanePort string
 	adminAPIPort  string
 	soPath        string
@@ -590,7 +588,7 @@ func (dp *DataPlane) Grpcurl(importPath, protoFile, fullMethodName, req string)
 	return cmd.CombinedOutput()
 }
 
-func (dp *DataPlane) Configured() bool {
+func (dp *DataPlane) Configured(expectedVersion string) bool {
 	resp, err := dp.Head("/detect_if_the_rds_takes_effect", nil)
 	if err != nil {
 		return false
@@ -599,11 +597,7 @@ func (dp *DataPlane) Configured() bool {
 		return false
 	}
 	name := resp.Header.Get("route-version")
-	if name == dp.latestRouteVersion {
-		return false
-	}
-	dp.latestRouteVersion = name
-	return true
+	return name == expectedVersion
 }
 
 func (dp *DataPlane) FlushCoverage() error {