DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

srevert some e2e changes

Browse source
This commit is contained in:
James Strong 2023-12-07 18:12:53 -05:00
parent 520709111c
commit f2664dfff7
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/e2e/framework/httpexpect/response.go
View file

@ -234,7 +234,9 @@ func (r *HTTPResponse) checkContentType(expectedType string, expectedCharset ...
} }
if mediaType != expectedType { if mediaType != expectedType {
r.chain.fail("\nexpected \"Content-Type\" header with %q media type but got %q", expectedType, mediaType) //nolint:goconst //string interpolation
r.chain.fail("\nexpected \"Content-Type\" header with %q media type,"+
"\nbut got %q", expectedType, mediaType)
return false return false
} }

8
test/e2e/settings/disable_sync_events.go
View file

@ -32,7 +32,6 @@ import (
var _ = framework.IngressNginxDescribe("[Flag] disable-sync-events", func() { var _ = framework.IngressNginxDescribe("[Flag] disable-sync-events", func() {
f := framework.NewDefaultFramework("disable-sync-events") f := framework.NewDefaultFramework("disable-sync-events")
selectorHost := "reason=Sync,involvedObject.name="
ginkgo.It("should create sync events (default)", func() { ginkgo.It("should create sync events (default)", func() {
host := "sync-events-default" host := "sync-events-default"
f.NewEchoDeployment(framework.WithDeploymentReplicas(1)) f.NewEchoDeployment(framework.WithDeploymentReplicas(1))
@ -45,7 +44,8 @@ var _ = framework.IngressNginxDescribe("[Flag] disable-sync-events", func() {
return strings.Contains(server, fmt.Sprintf("server_name %v", host)) return strings.Contains(server, fmt.Sprintf("server_name %v", host))
}) })
events, err := f.KubeClientSet.CoreV1().Events(ing.Namespace).List(context.TODO(), metav1.ListOptions{FieldSelector: selectorHost + host}) //nolint:goconst //string interpolation
events, err := f.KubeClientSet.CoreV1().Events(ing.Namespace).List(context.TODO(), metav1.ListOptions{FieldSelector: "reason=Sync,involvedObject.name=" + host})
assert.Nil(ginkgo.GinkgoT(), err, "listing events") assert.Nil(ginkgo.GinkgoT(), err, "listing events")
assert.NotEmpty(ginkgo.GinkgoT(), events.Items, "got events") assert.NotEmpty(ginkgo.GinkgoT(), events.Items, "got events")
@ -73,7 +73,7 @@ var _ = framework.IngressNginxDescribe("[Flag] disable-sync-events", func() {
return strings.Contains(server, fmt.Sprintf("server_name %v", host)) return strings.Contains(server, fmt.Sprintf("server_name %v", host))
}) })
events, err := f.KubeClientSet.CoreV1().Events(ing.Namespace).List(context.TODO(), metav1.ListOptions{FieldSelector: selectorHost + host}) events, err := f.KubeClientSet.CoreV1().Events(ing.Namespace).List(context.TODO(), metav1.ListOptions{FieldSelector: "reason=Sync,involvedObject.name=" + host})
assert.Nil(ginkgo.GinkgoT(), err, "listing events") assert.Nil(ginkgo.GinkgoT(), err, "listing events")
assert.NotEmpty(ginkgo.GinkgoT(), events.Items, "got events") assert.NotEmpty(ginkgo.GinkgoT(), events.Items, "got events")
@ -101,7 +101,7 @@ var _ = framework.IngressNginxDescribe("[Flag] disable-sync-events", func() {
return strings.Contains(server, fmt.Sprintf("server_name %v", host)) return strings.Contains(server, fmt.Sprintf("server_name %v", host))
}) })
events, err := f.KubeClientSet.CoreV1().Events(ing.Namespace).List(context.TODO(), metav1.ListOptions{FieldSelector: selectorHost + host}) events, err := f.KubeClientSet.CoreV1().Events(ing.Namespace).List(context.TODO(), metav1.ListOptions{FieldSelector: "reason=Sync,involvedObject.name=" + host})
assert.Nil(ginkgo.GinkgoT(), err, "listing events") assert.Nil(ginkgo.GinkgoT(), err, "listing events")
assert.Empty(ginkgo.GinkgoT(), events.Items, "got events") assert.Empty(ginkgo.GinkgoT(), events.Items, "got events")