diff --git a/test/e2e/annotations/affinity.go b/test/e2e/annotations/affinity.go index a80fba271..801ab5fec 100644 --- a/test/e2e/annotations/affinity.go +++ b/test/e2e/annotations/affinity.go @@ -40,9 +40,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Affinity/Sticky Sessions", f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("should set sticky cookie SERVERID", func() { host := "sticky.foo.com" annotations := map[string]string{ diff --git a/test/e2e/annotations/alias.go b/test/e2e/annotations/alias.go index 188387fbe..30756a532 100644 --- a/test/e2e/annotations/alias.go +++ b/test/e2e/annotations/alias.go @@ -34,9 +34,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() { f.NewEchoDeployment() }) - AfterEach(func() { - }) - It("should return status code 200 for host 'foo' and 404 for 'bar'", func() { host := "foo" annotations := map[string]string{} diff --git a/test/e2e/annotations/approot.go b/test/e2e/annotations/approot.go index 53bd181f1..9b0c65b2b 100644 --- a/test/e2e/annotations/approot.go +++ b/test/e2e/annotations/approot.go @@ -33,9 +33,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Approot", func() { f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("should redirect to /foo", func() { host := "approot.bar.com" diff --git a/test/e2e/annotations/authtls.go b/test/e2e/annotations/authtls.go index 350e21a92..eb46397a7 100644 --- a/test/e2e/annotations/authtls.go +++ b/test/e2e/annotations/authtls.go @@ -35,9 +35,6 @@ var _ = framework.IngressNginxDescribe("Annotations - AuthTLS", func() { f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("should set valid auth-tls-secret", func() { host := "authtls.foo.com" nameSpace := f.Namespace diff --git a/test/e2e/annotations/backendprotocol.go b/test/e2e/annotations/backendprotocol.go index c7e13d958..75b1ec9ee 100644 --- a/test/e2e/annotations/backendprotocol.go +++ b/test/e2e/annotations/backendprotocol.go @@ -29,9 +29,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Backendprotocol", func() { f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("should set backend protocol to https:// and use proxy_pass", func() { host := "backendprotocol.foo.com" annotations := map[string]string{ diff --git a/test/e2e/annotations/clientbodybuffersize.go b/test/e2e/annotations/clientbodybuffersize.go index 58d368004..e718fa1aa 100644 --- a/test/e2e/annotations/clientbodybuffersize.go +++ b/test/e2e/annotations/clientbodybuffersize.go @@ -29,9 +29,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Client-Body-Buffer-Size", f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("should set client_body_buffer_size to 1000", func() { host := "proxy.foo.com" annotations := map[string]string{ diff --git a/test/e2e/annotations/connection.go b/test/e2e/annotations/connection.go index 906624ca9..36a16d78f 100644 --- a/test/e2e/annotations/connection.go +++ b/test/e2e/annotations/connection.go @@ -34,9 +34,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Connection", func() { f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("set connection header to keep-alive", func() { host := "connection.foo.com" annotations := map[string]string{ diff --git a/test/e2e/annotations/cors.go b/test/e2e/annotations/cors.go index d75b2f4f0..d5ca52e31 100644 --- a/test/e2e/annotations/cors.go +++ b/test/e2e/annotations/cors.go @@ -33,9 +33,6 @@ var _ = framework.IngressNginxDescribe("Annotations - CORS", func() { f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("should enable cors", func() { host := "cors.foo.com" annotations := map[string]string{ diff --git a/test/e2e/annotations/customhttperrors.go b/test/e2e/annotations/customhttperrors.go index b7c84b7c8..78714b029 100644 --- a/test/e2e/annotations/customhttperrors.go +++ b/test/e2e/annotations/customhttperrors.go @@ -38,9 +38,6 @@ var _ = framework.IngressNginxDescribe("Annotations - custom-http-errors", func( f.NewEchoDeploymentWithReplicas(1) }) - AfterEach(func() { - }) - It("configures Nginx correctly", func() { host := "customerrors.foo.com" diff --git a/test/e2e/annotations/forcesslredirect.go b/test/e2e/annotations/forcesslredirect.go index b4823d98c..38b584596 100644 --- a/test/e2e/annotations/forcesslredirect.go +++ b/test/e2e/annotations/forcesslredirect.go @@ -33,9 +33,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Forcesslredirect", func() f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("should redirect to https", func() { host := "forcesslredirect.bar.com" diff --git a/test/e2e/annotations/fromtowwwredirect.go b/test/e2e/annotations/fromtowwwredirect.go index 3ec45a5e5..3785cbdf6 100644 --- a/test/e2e/annotations/fromtowwwredirect.go +++ b/test/e2e/annotations/fromtowwwredirect.go @@ -36,9 +36,6 @@ var _ = framework.IngressNginxDescribe("Annotations - from-to-www-redirect", fun f.NewEchoDeploymentWithReplicas(1) }) - AfterEach(func() { - }) - It("should redirect from www HTTP to HTTP", func() { By("setting up server for redirect from www") host := "fromtowwwredirect.bar.com" diff --git a/test/e2e/annotations/http2pushpreload.go b/test/e2e/annotations/http2pushpreload.go index 56c9c8151..2b132676f 100644 --- a/test/e2e/annotations/http2pushpreload.go +++ b/test/e2e/annotations/http2pushpreload.go @@ -29,9 +29,6 @@ var _ = framework.IngressNginxDescribe("Annotations - HTTP2 Push Preload", func( f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("enable the http2-push-preload directive", func() { host := "http2pp.foo.com" annotations := map[string]string{ diff --git a/test/e2e/annotations/ipwhitelist.go b/test/e2e/annotations/ipwhitelist.go index 385268046..47e3379e2 100644 --- a/test/e2e/annotations/ipwhitelist.go +++ b/test/e2e/annotations/ipwhitelist.go @@ -31,9 +31,6 @@ var _ = framework.IngressNginxDescribe("Annotations - IPWhiteList", func() { f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("should set valid ip whitelist range", func() { host := "ipwhitelist.foo.com" nameSpace := f.Namespace diff --git a/test/e2e/annotations/log.go b/test/e2e/annotations/log.go index d29c1eca4..6c6a83939 100644 --- a/test/e2e/annotations/log.go +++ b/test/e2e/annotations/log.go @@ -30,9 +30,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Log", func() { f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("set access_log off", func() { host := "log.foo.com" annotations := map[string]string{ diff --git a/test/e2e/annotations/mirror.go b/test/e2e/annotations/mirror.go index d2d809d6c..4ce64bcb0 100644 --- a/test/e2e/annotations/mirror.go +++ b/test/e2e/annotations/mirror.go @@ -33,9 +33,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Mirror", func() { f.NewEchoDeployment() }) - AfterEach(func() { - }) - It("should set mirror-target to http://localhost/mirror", func() { annotations := map[string]string{ "nginx.ingress.kubernetes.io/mirror-target": "http://localhost/mirror", diff --git a/test/e2e/annotations/modsecurity.go b/test/e2e/annotations/modsecurity.go index 8a767b967..4b3035008 100644 --- a/test/e2e/annotations/modsecurity.go +++ b/test/e2e/annotations/modsecurity.go @@ -30,9 +30,6 @@ var _ = framework.IngressNginxDescribe("Annotations - ModSecurityLocation", func f.NewEchoDeployment() }) - AfterEach(func() { - }) - It("should enable modsecurity", func() { host := "modsecurity.foo.com" nameSpace := f.Namespace diff --git a/test/e2e/annotations/proxy.go b/test/e2e/annotations/proxy.go index 602d2dc9f..f0eca994c 100644 --- a/test/e2e/annotations/proxy.go +++ b/test/e2e/annotations/proxy.go @@ -33,9 +33,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Proxy", func() { f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("should set proxy_redirect to off", func() { annotations := map[string]string{ "nginx.ingress.kubernetes.io/proxy-redirect-from": "off", diff --git a/test/e2e/annotations/proxyssl.go b/test/e2e/annotations/proxyssl.go index 3020c0c83..4b32a904c 100644 --- a/test/e2e/annotations/proxyssl.go +++ b/test/e2e/annotations/proxyssl.go @@ -32,9 +32,6 @@ var _ = framework.IngressNginxDescribe("Annotations - ProxySSL", func() { f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("should set valid proxy-ssl-secret", func() { host := "proxyssl.foo.com" annotations := map[string]string{ diff --git a/test/e2e/annotations/redirect.go b/test/e2e/annotations/redirect.go index 152e4b9bb..362acc483 100644 --- a/test/e2e/annotations/redirect.go +++ b/test/e2e/annotations/redirect.go @@ -37,12 +37,6 @@ func noRedirectPolicyFunc(gorequest.Request, []gorequest.Request) error { var _ = framework.IngressNginxDescribe("Annotations - Redirect", func() { f := framework.NewDefaultFramework("redirect") - BeforeEach(func() { - }) - - AfterEach(func() { - }) - It("should respond with a standard redirect code", func() { By("setting permanent-redirect annotation") diff --git a/test/e2e/annotations/rewrite.go b/test/e2e/annotations/rewrite.go index 8046a4010..0669b25b1 100644 --- a/test/e2e/annotations/rewrite.go +++ b/test/e2e/annotations/rewrite.go @@ -36,9 +36,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Rewrite", func() { f.NewEchoDeployment() }) - AfterEach(func() { - }) - It("should write rewrite logs", func() { By("setting enable-rewrite-log annotation") diff --git a/test/e2e/annotations/satisfy.go b/test/e2e/annotations/satisfy.go index 5d03e2034..cf9293d2b 100644 --- a/test/e2e/annotations/satisfy.go +++ b/test/e2e/annotations/satisfy.go @@ -37,9 +37,6 @@ var _ = framework.IngressNginxDescribe("Annotations - SATISFY", func() { f.NewEchoDeployment() }) - AfterEach(func() { - }) - It("should configure satisfy directive correctly", func() { host := "satisfy" annotationKey := "nginx.ingress.kubernetes.io/satisfy" diff --git a/test/e2e/annotations/serversnippet.go b/test/e2e/annotations/serversnippet.go index a87350dbb..594410003 100644 --- a/test/e2e/annotations/serversnippet.go +++ b/test/e2e/annotations/serversnippet.go @@ -31,9 +31,6 @@ var _ = framework.IngressNginxDescribe("Annotations - ServerSnippet", func() { f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It(`add valid directives to server via server snippet"`, func() { host := "serversnippet.foo.com" annotations := map[string]string{ diff --git a/test/e2e/annotations/snippet.go b/test/e2e/annotations/snippet.go index e7b034357..7f0277bf3 100644 --- a/test/e2e/annotations/snippet.go +++ b/test/e2e/annotations/snippet.go @@ -29,9 +29,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Configurationsnippet", fun f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It(`set snippet "more_set_headers "Request-Id: $req_id";" in all locations"`, func() { host := "configurationsnippet.foo.com" annotations := map[string]string{ diff --git a/test/e2e/annotations/sslciphers.go b/test/e2e/annotations/sslciphers.go index 4cded2dc4..22d948c50 100644 --- a/test/e2e/annotations/sslciphers.go +++ b/test/e2e/annotations/sslciphers.go @@ -30,9 +30,6 @@ var _ = framework.IngressNginxDescribe("Annotations - SSL CIPHERS", func() { f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("should change ssl ciphers", func() { host := "ciphers.foo.com" annotations := map[string]string{ diff --git a/test/e2e/annotations/upstreamhashby.go b/test/e2e/annotations/upstreamhashby.go index 90549949b..ea997295c 100644 --- a/test/e2e/annotations/upstreamhashby.go +++ b/test/e2e/annotations/upstreamhashby.go @@ -79,9 +79,6 @@ var _ = framework.IngressNginxDescribe("Annotations - UpstreamHashBy", func() { f.NewEchoDeploymentWithReplicas(6) }) - AfterEach(func() { - }) - It("should connect to the same pod", func() { annotations := map[string]string{ "nginx.ingress.kubernetes.io/upstream-hash-by": "$request_uri", @@ -101,6 +98,5 @@ var _ = framework.IngressNginxDescribe("Annotations - UpstreamHashBy", func() { podMap := startIngress(f, annotations) Expect(len(podMap)).Should(Equal(3)) - }) }) diff --git a/test/e2e/annotations/upstreamvhost.go b/test/e2e/annotations/upstreamvhost.go index 34e66f33e..08235f30c 100644 --- a/test/e2e/annotations/upstreamvhost.go +++ b/test/e2e/annotations/upstreamvhost.go @@ -29,9 +29,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Upstreamvhost", func() { f.NewEchoDeploymentWithReplicas(2) }) - AfterEach(func() { - }) - It("set host to upstreamvhost.bar.com", func() { host := "upstreamvhost.foo.com" annotations := map[string]string{ diff --git a/test/e2e/annotations/xforwardedprefix.go b/test/e2e/annotations/xforwardedprefix.go index 6057e86b1..b0871e9e9 100644 --- a/test/e2e/annotations/xforwardedprefix.go +++ b/test/e2e/annotations/xforwardedprefix.go @@ -32,9 +32,6 @@ var _ = framework.IngressNginxDescribe("Annotations - X-Forwarded-Prefix", func( f.NewEchoDeployment() }) - AfterEach(func() { - }) - It("should set the X-Forwarded-Prefix to the annotation value", func() { host := "xfp.baz.com" annotations := map[string]string{ diff --git a/test/e2e/dbg/main.go b/test/e2e/dbg/main.go index 16e678dee..b7187b77b 100644 --- a/test/e2e/dbg/main.go +++ b/test/e2e/dbg/main.go @@ -34,9 +34,6 @@ var _ = framework.IngressNginxDescribe("Debug Tool", func() { f.NewEchoDeploymentWithReplicas(1) }) - AfterEach(func() { - }) - It("should list the backend servers", func() { annotations := map[string]string{} diff --git a/test/e2e/defaultbackend/default_backend.go b/test/e2e/defaultbackend/default_backend.go index 6f42a8172..1a8c10be0 100644 --- a/test/e2e/defaultbackend/default_backend.go +++ b/test/e2e/defaultbackend/default_backend.go @@ -30,12 +30,6 @@ import ( var _ = framework.IngressNginxDescribe("Default backend", func() { f := framework.NewDefaultFramework("default-backend") - BeforeEach(func() { - }) - - AfterEach(func() { - }) - It("should return 404 sending requests when only a default backend is running", func() { testCases := []struct { Name string diff --git a/test/e2e/defaultbackend/ssl.go b/test/e2e/defaultbackend/ssl.go index 91b52152d..ae01c01e8 100644 --- a/test/e2e/defaultbackend/ssl.go +++ b/test/e2e/defaultbackend/ssl.go @@ -29,12 +29,6 @@ import ( var _ = framework.IngressNginxDescribe("Default backend - SSL", func() { f := framework.NewDefaultFramework("default-backend") - BeforeEach(func() { - }) - - AfterEach(func() { - }) - It("should return a self generated SSL certificate", func() { By("checking SSL Certificate using the NGINX IP address") resp, _, errs := gorequest.New(). diff --git a/test/e2e/defaultbackend/with_hosts.go b/test/e2e/defaultbackend/with_hosts.go index 9cf47abf8..2d7af3bc5 100644 --- a/test/e2e/defaultbackend/with_hosts.go +++ b/test/e2e/defaultbackend/with_hosts.go @@ -38,9 +38,6 @@ var _ = framework.IngressNginxDescribe("Default backend with hosts", func() { f.NewEchoDeploymentWithReplicas(1) }) - AfterEach(func() { - }) - It("should apply the annotation to the default backend", func() { annotations := map[string]string{ "nginx.ingress.kubernetes.io/proxy-buffer-size": "8k", diff --git a/test/e2e/gracefulshutdown/shutdown.go b/test/e2e/gracefulshutdown/shutdown.go index 4f3b53ae1..223ecc749 100755 --- a/test/e2e/gracefulshutdown/shutdown.go +++ b/test/e2e/gracefulshutdown/shutdown.go @@ -39,9 +39,6 @@ var _ = framework.IngressNginxDescribe("Shutdown ingress controller", func() { f.NewSlowEchoDeployment() }) - AfterEach(func() { - }) - It("should shutdown in less than 60 secons without pending connections", func() { f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.Namespace, framework.SlowEchoService, 80, nil)) diff --git a/test/e2e/leaks/lua_ssl.go b/test/e2e/leaks/lua_ssl.go index 2ab9e0b39..2b91ac40d 100644 --- a/test/e2e/leaks/lua_ssl.go +++ b/test/e2e/leaks/lua_ssl.go @@ -40,9 +40,6 @@ var _ = framework.IngressNginxDescribe("DynamicCertificates", func() { f.NewEchoDeployment() }) - AfterEach(func() { - }) - framework.MemoryLeakIt("should not leak memory from ingress SSL certificates or configuration updates", func() { hostCount := 1000 iterations := 10 diff --git a/test/e2e/loadbalance/configmap.go b/test/e2e/loadbalance/configmap.go index b769ab494..236d1e875 100644 --- a/test/e2e/loadbalance/configmap.go +++ b/test/e2e/loadbalance/configmap.go @@ -32,9 +32,6 @@ var _ = framework.IngressNginxDescribe("Load Balance - Configmap value", func() f.NewEchoDeploymentWithReplicas(1) }) - AfterEach(func() { - }) - It("should apply the configmap load-balance setting", func() { host := "load-balance.com" diff --git a/test/e2e/security/request_smuggling.go b/test/e2e/security/request_smuggling.go index 2b80a77c1..09bb6d909 100644 --- a/test/e2e/security/request_smuggling.go +++ b/test/e2e/security/request_smuggling.go @@ -36,9 +36,6 @@ var _ = framework.IngressNginxDescribe("Request smuggling", func() { f.NewEchoDeployment() }) - AfterEach(func() { - }) - It("should not return body content from error_page", func() { host := "foo.bar.com" diff --git a/test/e2e/servicebackend/service_backend.go b/test/e2e/servicebackend/service_backend.go index 3a6dba086..eaa30eacd 100644 --- a/test/e2e/servicebackend/service_backend.go +++ b/test/e2e/servicebackend/service_backend.go @@ -35,12 +35,6 @@ import ( var _ = framework.IngressNginxDescribe("Service backend - 503", func() { f := framework.NewDefaultFramework("service-backend") - BeforeEach(func() { - }) - - AfterEach(func() { - }) - It("should return 503 when backend service does not exist", func() { host := "nonexistent.svc.com" diff --git a/test/e2e/servicebackend/service_externalname.go b/test/e2e/servicebackend/service_externalname.go index d02104b08..51d83273b 100644 --- a/test/e2e/servicebackend/service_externalname.go +++ b/test/e2e/servicebackend/service_externalname.go @@ -35,12 +35,6 @@ import ( var _ = framework.IngressNginxDescribe("Service Type ExternalName", func() { f := framework.NewDefaultFramework("type-externalname") - BeforeEach(func() { - }) - - AfterEach(func() { - }) - It("works with external name set to incomplete fdqn", func() { f.NewEchoDeployment() diff --git a/test/e2e/settings/configmap_change.go b/test/e2e/settings/configmap_change.go index 927b702eb..5565565c9 100644 --- a/test/e2e/settings/configmap_change.go +++ b/test/e2e/settings/configmap_change.go @@ -33,9 +33,6 @@ var _ = framework.IngressNginxDescribe("Configmap change", func() { f.NewEchoDeployment() }) - AfterEach(func() { - }) - It("should reload after an update in the configuration", func() { host := "configmap-change" diff --git a/test/e2e/settings/disable_catch_all.go b/test/e2e/settings/disable_catch_all.go index c389b36cf..37b9dba6c 100644 --- a/test/e2e/settings/disable_catch_all.go +++ b/test/e2e/settings/disable_catch_all.go @@ -49,9 +49,6 @@ var _ = framework.IngressNginxDescribe("Disabled catch-all", func() { Expect(err).NotTo(HaveOccurred(), "unexpected error updating ingress controller deployment flags") }) - AfterEach(func() { - }) - It("should ignore catch all Ingress", func() { host := "foo" diff --git a/test/e2e/settings/forwarded_headers.go b/test/e2e/settings/forwarded_headers.go index 49aa910e7..dcfbd4de6 100644 --- a/test/e2e/settings/forwarded_headers.go +++ b/test/e2e/settings/forwarded_headers.go @@ -38,9 +38,6 @@ var _ = framework.IngressNginxDescribe("X-Forwarded headers", func() { f.UpdateNginxConfigMapData(setting, "false") }) - AfterEach(func() { - }) - It("should trust X-Forwarded headers when setting is true", func() { host := "forwarded-headers" diff --git a/test/e2e/settings/global_access_block.go b/test/e2e/settings/global_access_block.go index 6a7cd739e..61d1a1b5a 100644 --- a/test/e2e/settings/global_access_block.go +++ b/test/e2e/settings/global_access_block.go @@ -37,9 +37,6 @@ var _ = framework.IngressNginxDescribe("Global access block", func() { f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)) }) - AfterEach(func() { - }) - It("should block CIDRs defined in the ConfigMap", func() { f.UpdateNginxConfigMapData("block-cidrs", "172.16.0.0/12,192.168.0.0/16,10.0.0.0/8") diff --git a/test/e2e/settings/global_external_auth.go b/test/e2e/settings/global_external_auth.go index c944c9697..c6ae0bc38 100755 --- a/test/e2e/settings/global_external_auth.go +++ b/test/e2e/settings/global_external_auth.go @@ -50,9 +50,6 @@ var _ = framework.IngressNginxDescribe("Global External Auth", func() { f.NewHttpbinDeployment() }) - AfterEach(func() { - }) - Context("when global external authentication is configured", func() { BeforeEach(func() { diff --git a/test/e2e/settings/ingress_class.go b/test/e2e/settings/ingress_class.go index 9e9be4ae8..e96916c58 100644 --- a/test/e2e/settings/ingress_class.go +++ b/test/e2e/settings/ingress_class.go @@ -37,9 +37,6 @@ var _ = framework.IngressNginxDescribe("Ingress class", func() { f.NewEchoDeploymentWithReplicas(1) }) - AfterEach(func() { - }) - Context("Without a specific ingress-class", func() { It("should ignore Ingress with class", func() { diff --git a/test/e2e/settings/lua_shared_dicts.go b/test/e2e/settings/lua_shared_dicts.go index d76ca87ad..01aeaffb3 100644 --- a/test/e2e/settings/lua_shared_dicts.go +++ b/test/e2e/settings/lua_shared_dicts.go @@ -31,9 +31,6 @@ var _ = framework.IngressNginxDescribe("LuaSharedDict", func() { f.NewEchoDeployment() }) - AfterEach(func() { - }) - It("configures lua shared dicts", func() { ingress := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil) f.EnsureIngress(ingress) diff --git a/test/e2e/settings/no_auth_locations.go b/test/e2e/settings/no_auth_locations.go index da52222f1..95bef6c02 100644 --- a/test/e2e/settings/no_auth_locations.go +++ b/test/e2e/settings/no_auth_locations.go @@ -53,9 +53,6 @@ var _ = framework.IngressNginxDescribe("No Auth locations", func() { f.EnsureIngress(bi) }) - AfterEach(func() { - }) - It("should return status code 401 when accessing '/' unauthentication", func() { f.WaitForNginxServer(host, func(server string) bool { diff --git a/test/e2e/settings/proxy_protocol.go b/test/e2e/settings/proxy_protocol.go index e0348c4ed..60038a735 100644 --- a/test/e2e/settings/proxy_protocol.go +++ b/test/e2e/settings/proxy_protocol.go @@ -38,9 +38,6 @@ var _ = framework.IngressNginxDescribe("Proxy Protocol", func() { f.UpdateNginxConfigMapData(setting, "false") }) - AfterEach(func() { - }) - It("should respect port passed by the PROXY Protocol", func() { host := "proxy-protocol" diff --git a/test/e2e/settings/server_tokens.go b/test/e2e/settings/server_tokens.go index 0ef4b46c6..27f96ff74 100644 --- a/test/e2e/settings/server_tokens.go +++ b/test/e2e/settings/server_tokens.go @@ -35,9 +35,6 @@ var _ = framework.IngressNginxDescribe("Server Tokens", func() { f.NewEchoDeployment() }) - AfterEach(func() { - }) - It("should not exists Server header in the response", func() { f.UpdateNginxConfigMapData(serverTokens, "false") diff --git a/test/e2e/settings/tls.go b/test/e2e/settings/tls.go index 4daa0d544..b692e496d 100644 --- a/test/e2e/settings/tls.go +++ b/test/e2e/settings/tls.go @@ -43,9 +43,6 @@ var _ = framework.IngressNginxDescribe("Settings - TLS)", func() { f.UpdateNginxConfigMapData("use-forwarded-headers", "false") }) - AfterEach(func() { - }) - It("should configure TLS protocol", func() { sslCiphers := "ssl-ciphers" sslProtocols := "ssl-protocols" diff --git a/test/e2e/ssl/http_redirect.go b/test/e2e/ssl/http_redirect.go index 5f26284e9..9274d93ec 100644 --- a/test/e2e/ssl/http_redirect.go +++ b/test/e2e/ssl/http_redirect.go @@ -34,9 +34,6 @@ var _ = framework.IngressNginxDescribe("sslredirect", func() { f.NewEchoDeployment() }) - AfterEach(func() { - }) - It("should redirect from HTTP to HTTPS when secret is missing", func() { host := "redirect.com" diff --git a/test/e2e/ssl/secret_update.go b/test/e2e/ssl/secret_update.go index 2184da7bf..407f1548c 100644 --- a/test/e2e/ssl/secret_update.go +++ b/test/e2e/ssl/secret_update.go @@ -39,9 +39,6 @@ var _ = framework.IngressNginxDescribe("SSL", func() { f.NewEchoDeployment() }) - AfterEach(func() { - }) - It("should not appear references to secret updates not used in ingress rules", func() { host := "ssl-update" diff --git a/test/e2e/status/update.go b/test/e2e/status/update.go index 0515a83e6..c744c33cf 100644 --- a/test/e2e/status/update.go +++ b/test/e2e/status/update.go @@ -39,12 +39,6 @@ var _ = framework.IngressNginxDescribe("Status Update [Status]", func() { host := "status-update" address := getHostIP() - BeforeEach(func() { - }) - - AfterEach(func() { - }) - It("should update status field after client-go reconnection", func() { port, cmd, err := f.KubectlProxy(0) Expect(err).NotTo(HaveOccurred(), "unexpected error starting kubectl proxy") diff --git a/test/e2e/tcpudp/tcp.go b/test/e2e/tcpudp/tcp.go index 2855a4982..20e82c7c6 100644 --- a/test/e2e/tcpudp/tcp.go +++ b/test/e2e/tcpudp/tcp.go @@ -37,12 +37,6 @@ import ( var _ = framework.IngressNginxDescribe("TCP Feature", func() { f := framework.NewDefaultFramework("tcp") - BeforeEach(func() { - }) - - AfterEach(func() { - }) - It("should expose a TCP service", func() { f.NewEchoDeploymentWithReplicas(1)