comment

Author: alexeykazakov

testsupport/wait/member.go

@@ -1525,7 +1525,7 @@ func (a *MemberAwaitility) WaitForAAP(t *testing.T, name, namespace string, aapR
 	var aap *unstructured.Unstructured
 	err := wait.PollUntilContextTimeout(context.TODO(), a.RetryInterval, a.Timeout, true, func(ctx context.Context) (bool, error) {
 		var err error
-		aap, err = aapRes.Namespace(namespace).Get(context.Background(), name, metav1.GetOptions{})
+		aap, err = aapRes.Namespace(namespace).Get(ctx, name, metav1.GetOptions{})
 		if err != nil {
 			if errors.IsNotFound(err) {
 				return false, nil
@@ -1547,17 +1547,20 @@ func (a *MemberAwaitility) WaitForClaw(t *testing.T, name, namespace string, cla
 	var claw *unstructured.Unstructured
 	err := wait.PollUntilContextTimeout(context.TODO(), a.RetryInterval, a.Timeout, true, func(ctx context.Context) (bool, error) {
 		var err error
-		claw, err = clawRes.Namespace(namespace).Get(context.Background(), name, metav1.GetOptions{})
+		claw, err = clawRes.Namespace(namespace).Get(ctx, name, metav1.GetOptions{})
 		if err != nil {
 			if errors.IsNotFound(err) {
 				return false, nil
 			}
 			return false, err
 		}
-		idled, _, err := unstructured.NestedBool(claw.UnstructuredContent(), "spec", "idle")
+		idled, found, err := unstructured.NestedBool(claw.UnstructuredContent(), "spec", "idle")
 		if err != nil {
 			return true, err
 		}
+		if !found {
+			return false, nil
+		}
 		return expectedIdled == idled, nil
 	})
 	return claw, err