fix broken test

Signed-off-by: Sean Teeling <[email protected]>

Author: steeling

cmd/osm-healthcheck/osm-healthcheck_test.go

@@ -58,6 +58,8 @@ func TestGetHealthcheckHander(t *testing.T) {
 				//#nosec G307
 				defer listener.Close()
 
+				// required to avoid https://github.com/golang/go/wiki/CommonMistakes#using-goroutines-on-loop-iterator-variables
+				test := test
 				go func() {
 					conn, err := listener.Accept()
 					assert.Nil(err)

pkg/envoy/ads/response_test.go

@@ -172,7 +172,7 @@ var _ = Describe("Test ADS response functions", func() {
 				CertType: secrets.ServiceCertType,
 			}.String()))
 
-			Expect(metricsstore.DefaultMetricsStore.Contains(fmt.Sprintf("osm_proxy_response_send_success_count{proxy_name=%q,type=%q} 1\n", proxy.GetName(), envoy.TypeCDS))).To(BeTrue())
+			Expect(metricsstore.DefaultMetricsStore.Contains(fmt.Sprintf("osm_proxy_response_send_success_count{identity=%q,proxy_uuid=%q,type=%q} 1\n", proxy.Identity, proxy.UUID, envoy.TypeCDS))).To(BeTrue())
 		})
 	})
 

pkg/envoy/cds/response_test.go

@@ -119,7 +119,7 @@ func TestNewResponse(t *testing.T) {
 	_, err := kubeClient.CoreV1().Pods(tests.Namespace).Create(context.TODO(), newPod1, metav1.CreateOptions{})
 	assert.Nil(err)
 
-	mockKubeController.EXPECT().GetPodForProxy(proxy).Return(&newPod1, nil)
+	mockKubeController.EXPECT().GetPodForProxy(proxy).Return(newPod1, nil)
 
 	resp, err := NewResponse(mockCatalog, proxy, nil, mockConfigurator, nil, proxyRegistry)
 	assert.Nil(err)

pkg/envoy/registry/services_test.go

@@ -113,7 +113,7 @@ var _ = Describe("Test Proxy-Service mapping", func() {
 			}, nil).Times(1)
 
 			proxy := envoy.NewProxy(envoy.KindSidecar, proxyUUID, identity.New(tests.BookstoreServiceAccountName, tests.Namespace), nil)
-			mockKubeController.EXPECT().GetPodForProxy(proxy).Return(&pod, nil).Times(1)
+			mockKubeController.EXPECT().GetPodForProxy(proxy).Return(pod, nil).Times(1)
 			meshServices, err := proxyRegistry.ListProxyServices(proxy)
 			Expect(err).ToNot(HaveOccurred())
 
@@ -150,7 +150,7 @@ var _ = Describe("Test Proxy-Service mapping", func() {
 			expectedList := []service.MeshService{expected}
 			mockKubeController.EXPECT().GetEndpoints(gomock.Any()).Return(nil, nil)
 
-			mockKubeController.EXPECT().GetPodForProxy(newProxy).Return(&newPod, nil).Times(1)
+			mockKubeController.EXPECT().GetPodForProxy(newProxy).Return(newPod, nil).Times(1)
 			// Subdomain gets called in the ListProxyServices
 			meshServices, err := proxyRegistry.ListProxyServices(newProxy)
 			Expect(err).ToNot(HaveOccurred())

pkg/k8s/client_test.go

@@ -1095,7 +1095,6 @@ func TestGetPodForProxy(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			assert := tassert.New(t)
-
 			pod, err := kubeController.GetPodForProxy(tc.proxy)
 
 			assert.Equal(tc.pod, pod)
@@ -1109,7 +1108,7 @@ func monitoredNS(name string) *v1.Namespace {
 		ObjectMeta: metav1.ObjectMeta{
 			Name: name,
 			Labels: map[string]string{
-				constants.OSMKubeResourceMonitorAnnotation: "osm",
+				constants.OSMKubeResourceMonitorAnnotation: testMeshName,
 			},
 		},
 	}