From 2754ff91aab7492846e72e48dbe2449738ee8069 Mon Sep 17 00:00:00 2001
From: Minhan Xia <mixia@google.com>
Date: Tue, 12 May 2020 10:25:19 -0700
Subject: [PATCH] adjust TestILBError to tolerate NEG defaulting

---
 cmd/e2e-test/ilb_test.go | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/cmd/e2e-test/ilb_test.go b/cmd/e2e-test/ilb_test.go
index 001f361631..7e56319e4d 100644
--- a/cmd/e2e-test/ilb_test.go
+++ b/cmd/e2e-test/ilb_test.go
@@ -498,10 +498,34 @@ func TestILBError(t *testing.T) {
 			}
 			t.Logf("Ingress created (%s/%s)", s.Namespace, tc.ing.Name)
 
+			// Retrieve service NEG annotation
+			// TODO(freehan): remove this once NEG is default for all qualified cluster versions
+			svc, err := Framework.Clientset.CoreV1().Services(s.Namespace).Get(context.TODO(), serviceName, metav1.GetOptions{})
+			if err != nil {
+				t.Fatalf("expect err = nil, but got %v", err)
+			}
+			svcAnnotation := annotations.FromService(svc)
+			negAnnotation, ok, err := svcAnnotation.NEGAnnotation()
+			if err != nil {
+				t.Fatalf("expect err = nil, but got %v", err)
+			}
+
+			// Proceed with error expectation according to NEG annotation
+			// TODO(freehan): remove this once NEG is default for all qualified cluster versions
+			expectError := true
+			if ok && negAnnotation.Ingress {
+				expectError = false
+			}
+
 			_, err = e2e.WaitForIngress(s, tc.ing, nil)
-			if err == nil {
+
+			if expectError && err == nil {
 				t.Fatalf("want err, got nil")
 			}
+
+			if !expectError && err != nil {
+				t.Fatalf("want err nil, got err %v", err)
+			}
 		})
 	}
 }