fix ut

Author: Eikykun

pkg/manager/controllers/circuitbreaker/event_handler.go

@@ -126,7 +126,7 @@ func matchChangedBreakers(c client.Reader, old, new *v1.Pod) ([]*ctrlmeshv1alpha
 		}
 		oldMatch := selector.Matches(labels.Set(old.Labels))
 		newMatch := selector.Matches(labels.Set(new.Labels))
-		if oldMatch == newMatch {
+		if oldMatch != newMatch {
 			res = append(res, &breakers.Items[i])
 		}
 	}

pkg/manager/controllers/faultinjection/event_handler.go

@@ -127,7 +127,7 @@ func matchChangedFaults(c client.Reader, old, new *v1.Pod) ([]*ctrlmeshv1alpha1.
 		}
 		oldMatch := selector.Matches(labels.Set(old.Labels))
 		newMatch := selector.Matches(labels.Set(new.Labels))
-		if oldMatch == newMatch { // REMOVE: 为什么不是同时为true
+		if oldMatch != newMatch {
 			res = append(res, &faults.Items[i])
 		}
 	}

pkg/manager/controllers/faultinjection/faultinjection_controller_test.go

@@ -107,6 +107,7 @@ var faultInjection = &ctrlmeshv1alpha1.FaultInjection{
 func TestFaultInjection(t *testing.T) {
 	g := gomega.NewGomegaWithT(t)
 	defer Stop()
+	grpcserver.GrpcServerPort = 5455
 	RunMockServer()
 	testPod := mockPod.DeepCopy()
 	testFaultInjection := faultInjection.DeepCopy()
@@ -198,7 +199,6 @@ func TestFaultInjection(t *testing.T) {
 		return c.Get(ctx, types.NamespacedName{Name: "testfi", Namespace: "default"}, cb)
 	}, 5*time.Second, 1*time.Second).Should(gomega.HaveOccurred())
 	fmt.Println("test finished")
-
 }
 
 var faultManager faultinjection.ManagerInterface

pkg/proxy/grpcserver/server.go

@@ -35,15 +35,15 @@ import (
 )
 
 var (
-	grpcServerPort = constants.ProxyGRPCServerPort
+	GrpcServerPort = constants.ProxyGRPCServerPort
 )
 
 func init() {
 	envConfig := os.Getenv(constants.EnvProxyGRPCServerPort)
 	if envConfig != "" {
 		p, err := strconv.Atoi(envConfig)
 		if err != nil {
-			grpcServerPort = p
+			GrpcServerPort = p
 		}
 	}
 }
@@ -59,7 +59,7 @@ func (s *GrpcServer) Start(ctx context.Context) {
 	s.mux = http.NewServeMux()
 	s.mux.Handle(protoconnect.NewThrottlingHandler(&grpcThrottlingHandler{mgr: s.BreakerMgr}, connect.WithSendMaxBytes(1024*1024*64)))
 	s.mux.Handle(protoconnect.NewFaultInjectHandler(&grpcFaultInjectHandler{mgr: s.FaultInjectionMgr}, connect.WithSendMaxBytes(1024*1024*64)))
-	addr := fmt.Sprintf(":%d", grpcServerPort)
+	addr := fmt.Sprintf(":%d", GrpcServerPort)
 	go func() {
 		// Use h2c so we can serve HTTP/2 without TLS.
 		if err := http.ListenAndServe(addr, h2c.NewHandler(s.mux, &http2.Server{})); err != nil {

pkg/proxy/grpcserver/server_test.go

@@ -36,7 +36,7 @@ import (
 func TestServer(t *testing.T) {
 	g := gomega.NewGomegaWithT(t)
 	ctx := context.TODO()
-	grpcServerPort = 8889
+	GrpcServerPort = 8889
 	breakerMgr := circuitbreaker.NewManager(ctx)
 	proxyServer := &GrpcServer{BreakerMgr: breakerMgr}
 	go proxyServer.Start(ctx)