improve error messages

Author: mattfenwick

pkg/connectivity/probe/pod.go

@@ -63,25 +63,25 @@ func (p *Pod) Host(probeMode generator.ProbeMode) string {
 	}
 }
 
-func (p *Pod) IsEqualToKubePod(kubePod v1.Pod) bool {
+func (p *Pod) IsEqualToKubePod(kubePod v1.Pod) (string, bool) {
 	kubeConts := kubePod.Spec.Containers
 	if len(kubeConts) != len(p.Containers) {
-		return false
+		return fmt.Sprintf("have %d containers, expected %d", len(p.Containers), len(kubeConts)), false
 	}
 	for i, kubeCont := range kubeConts {
 		cont := p.Containers[i]
 		if len(kubeCont.Ports) != 1 {
-			return false
+			return fmt.Sprintf("container %d: expected 1 port, found %d", i, len(kubeCont.Ports)), false
 		}
 		if int(kubeCont.Ports[0].ContainerPort) != cont.Port {
-			return false
+			return fmt.Sprintf("container %d: expected port %d, found %d", i, cont.Port, kubeCont.Ports[0].ContainerPort), false
 		}
 		if kubeCont.Ports[0].Protocol != cont.Protocol {
-			return false
+			return fmt.Sprintf("container %d: expected protocol %s, found %s", i, cont.Protocol, kubeCont.Ports[0].Protocol), false
 		}
 	}
 
-	return true
+	return "", true
 }
 
 func (p *Pod) ServiceName() string {

pkg/connectivity/testcasestate.go

@@ -200,8 +200,8 @@ func (t *TestCaseState) verifyClusterStateHelper() error {
 			if actualPod.Status.PodIP != expectedPod.IP {
 				return errors.Errorf("for pod %s, expected ip %s (found %s)", expectedPod.PodString().String(), expectedPod.IP, actualPod.Status.PodIP)
 			}
-			if !expectedPod.IsEqualToKubePod(actualPod) {
-				return errors.Errorf("for pod %s, expected containers %+v (found %+v)", expectedPod.PodString().String(), expectedPod.Containers, actualPod.Spec.Containers)
+			if diff, ok := expectedPod.IsEqualToKubePod(actualPod); !ok {
+				return errors.Errorf("for pod %s, %s", expectedPod.PodString().String(), diff)
 			}
 		} else {
 			return errors.Errorf("missing expected pod %s", expectedPod.PodString().String())

pkg/kube/ikubernetes.go

@@ -120,8 +120,8 @@ func (m *MockKubernetes) GetNamespace(namespace string) (*v1.Namespace, error) {
 		labels["kubernetes.io/metadata.name"] = namespace
 		return &v1.Namespace{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: ns.NamespaceObject.Name,
-				Labels:labels,
+				Name:   ns.NamespaceObject.Name,
+				Labels: labels,
 			},
 		}, nil
 	}