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

Cleanup and standardization of e2e test definitions (#5090)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-02-16 15:27:58 -03:00 • committed by GitHub
parent 45c9f94b17
commit cc318cdec1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 90 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/e2e/annotations/affinity.go
View file

@ -33,7 +33,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Affinity/Sticky Sessions", func() {
var _ = framework.DescribeAnnotation("affinity session-cookie-name", func() {
f := framework.NewDefaultFramework("affinity")
BeforeEach(func() {

2
test/e2e/annotations/alias.go
View file

@ -27,7 +27,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
var _ = framework.DescribeAnnotation("server-alias", func() {
f := framework.NewDefaultFramework("alias")
BeforeEach(func() {

2
test/e2e/annotations/approot.go
View file

@ -26,7 +26,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Approot", func() {
var _ = framework.DescribeAnnotation("app-root", func() {
f := framework.NewDefaultFramework("approot")
BeforeEach(func() {

2
test/e2e/annotations/auth.go
View file

@ -33,7 +33,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
var _ = framework.DescribeAnnotation("auth-*", func() {
f := framework.NewDefaultFramework("auth")
BeforeEach(func() {

2
test/e2e/annotations/authtls.go
View file

@ -28,7 +28,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - AuthTLS", func() {
var _ = framework.DescribeAnnotation("auth-tls-*", func() {
f := framework.NewDefaultFramework("authtls")
BeforeEach(func() {

2
test/e2e/annotations/backendprotocol.go
View file

@ -22,7 +22,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Backendprotocol", func() {
var _ = framework.DescribeAnnotation("backend-protocol", func() {
f := framework.NewDefaultFramework("backendprotocol")
BeforeEach(func() {

2
test/e2e/annotations/canary.go
View file

@ -31,7 +31,7 @@ const (
canaryService = "echo-canary"
)
var _ = framework.IngressNginxDescribe("Annotations - canary", func() {
var _ = framework.DescribeAnnotation("canary-*", func() {
f := framework.NewDefaultFramework("canary")
BeforeEach(func() {

2
test/e2e/annotations/clientbodybuffersize.go
View file

@ -22,7 +22,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Client-Body-Buffer-Size", func() {
var _ = framework.DescribeAnnotation("client-body-buffer-size", func() {
f := framework.NewDefaultFramework("clientbodybuffersize")
BeforeEach(func() {

2
test/e2e/annotations/connection.go
View file

@ -27,7 +27,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Connection", func() {
var _ = framework.DescribeAnnotation("connection-proxy-header", func() {
f := framework.NewDefaultFramework("connection")
BeforeEach(func() {

2
test/e2e/annotations/cors.go
View file

@ -26,7 +26,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - CORS", func() {
var _ = framework.DescribeAnnotation("cors-*", func() {
f := framework.NewDefaultFramework("cors")
BeforeEach(func() {

2
test/e2e/annotations/customhttperrors.go
View file

@ -31,7 +31,7 @@ func errorBlockName(upstreamName string, errorCode string) string {
return fmt.Sprintf("@custom_%s_%s", upstreamName, errorCode)
}
var _ = framework.IngressNginxDescribe("Annotations - custom-http-errors", func() {
var _ = framework.DescribeAnnotation("custom-http-errors", func() {
f := framework.NewDefaultFramework("custom-http-errors")
BeforeEach(func() {

2
test/e2e/annotations/default_backend.go
View file

@ -27,7 +27,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - custom default-backend", func() {
var _ = framework.DescribeAnnotation("default-backend", func() {
f := framework.NewDefaultFramework("default-backend")
BeforeEach(func() {

2
test/e2e/annotations/fastcgi.go
View file

@ -28,7 +28,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - FastCGI", func() {
var _ = framework.DescribeAnnotation("backend-protocol - FastCGI", func() {
f := framework.NewDefaultFramework("fastcgi")
BeforeEach(func() {

2
test/e2e/annotations/forcesslredirect.go
View file

@ -26,7 +26,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Forcesslredirect", func() {
var _ = framework.DescribeAnnotation("force-ssl-redirect", func() {
f := framework.NewDefaultFramework("forcesslredirect")
BeforeEach(func() {

2
test/e2e/annotations/fromtowwwredirect.go
View file

@ -29,7 +29,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - from-to-www-redirect", func() {
var _ = framework.DescribeAnnotation("from-to-www-redirect", func() {
f := framework.NewDefaultFramework("fromtowwwredirect")
BeforeEach(func() {

2
test/e2e/annotations/grpc.go
View file

@ -36,7 +36,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - GRPC", func() {
var _ = framework.DescribeAnnotation("backend-protocol - GRPC", func() {
f := framework.NewDefaultFramework("grpc")
It("should use grpc_pass in the configuration file", func() {

2
test/e2e/annotations/http2pushpreload.go
View file

@ -22,7 +22,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - HTTP2 Push Preload", func() {
var _ = framework.DescribeAnnotation("http2-push-preload", func() {
f := framework.NewDefaultFramework("http2pushpreload")
BeforeEach(func() {

2
test/e2e/annotations/influxdb.go
View file

@ -36,7 +36,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - influxdb", func() {
var _ = framework.DescribeAnnotation("influxdb-*", func() {
f := framework.NewDefaultFramework("influxdb")
BeforeEach(func() {

2
test/e2e/annotations/ipwhitelist.go
View file

@ -24,7 +24,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - IPWhiteList", func() {
var _ = framework.DescribeAnnotation("whitelist-source-range", func() {
f := framework.NewDefaultFramework("ipwhitelist")
BeforeEach(func() {

2
test/e2e/annotations/log.go
View file

@ -23,7 +23,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Log", func() {
var _ = framework.DescribeAnnotation("enable-access-log enable-rewrite-log", func() {
f := framework.NewDefaultFramework("log")
BeforeEach(func() {

2
test/e2e/annotations/mirror.go
View file

@ -25,7 +25,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Mirror", func() {
var _ = framework.DescribeAnnotation("mirror-*", func() {
f := framework.NewDefaultFramework("mirror")
host := "mirror.foo.com"

2
test/e2e/annotations/modsecurity.go
View file

@ -23,7 +23,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - ModSecurityLocation", func() {
var _ = framework.DescribeAnnotation("modsecurity owasp", func() {
f := framework.NewDefaultFramework("modsecuritylocation")
BeforeEach(func() {

2
test/e2e/annotations/proxy.go
View file

@ -25,7 +25,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Proxy", func() {
var _ = framework.DescribeAnnotation("proxy-*", func() {
f := framework.NewDefaultFramework("proxy")
host := "proxy.foo.com"

2
test/e2e/annotations/proxyssl.go
View file

@ -25,7 +25,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - ProxySSL", func() {
var _ = framework.DescribeAnnotation("proxy-ssl-*", func() {
f := framework.NewDefaultFramework("proxyssl")
BeforeEach(func() {

2
test/e2e/annotations/redirect.go
View file

@ -34,7 +34,7 @@ func noRedirectPolicyFunc(gorequest.Request, []gorequest.Request) error {
return http.ErrUseLastResponse
}
var _ = framework.IngressNginxDescribe("Annotations - Redirect", func() {
var _ = framework.DescribeAnnotation("permanen-redirect permanen-redirect-code", func() {
f := framework.NewDefaultFramework("redirect")
It("should respond with a standard redirect code", func() {

2
test/e2e/annotations/rewrite.go
View file

@ -29,7 +29,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Rewrite", func() {
var _ = framework.DescribeAnnotation("rewrite-target use-regex enable-rewrite-log", func() {
f := framework.NewDefaultFramework("rewrite")
BeforeEach(func() {

2
test/e2e/annotations/satisfy.go
View file

@ -30,7 +30,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - SATISFY", func() {
var _ = framework.DescribeAnnotation("satisfy", func() {
f := framework.NewDefaultFramework("satisfy")
BeforeEach(func() {

2
test/e2e/annotations/serversnippet.go
View file

@ -24,7 +24,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - ServerSnippet", func() {
var _ = framework.DescribeAnnotation("server-snippet", func() {
f := framework.NewDefaultFramework("serversnippet")
BeforeEach(func() {

2
test/e2e/annotations/snippet.go
View file

@ -22,7 +22,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Configurationsnippet", func() {
var _ = framework.DescribeAnnotation("configuration-snippet", func() {
f := framework.NewDefaultFramework("configurationsnippet")
BeforeEach(func() {

2
test/e2e/annotations/sslciphers.go
View file

@ -23,7 +23,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - SSL CIPHERS", func() {
var _ = framework.DescribeAnnotation("ssl-ciphers", func() {
f := framework.NewDefaultFramework("sslciphers")
BeforeEach(func() {

2
test/e2e/annotations/upstreamhashby.go
View file

@ -72,7 +72,7 @@ func startIngress(f *framework.Framework, annotations map[string]string) map[str
return podMap
}
var _ = framework.IngressNginxDescribe("Annotations - UpstreamHashBy", func() {
var _ = framework.DescribeAnnotation("upstream-hash-by-*", func() {
f := framework.NewDefaultFramework("upstream-hash-by")
BeforeEach(func() {

2
test/e2e/annotations/upstreamvhost.go
View file

@ -22,7 +22,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - Upstreamvhost", func() {
var _ = framework.DescribeAnnotation("upstream-vhost", func() {
f := framework.NewDefaultFramework("upstreamvhost")
BeforeEach(func() {

2
test/e2e/annotations/xforwardedprefix.go
View file

@ -25,7 +25,7 @@ import (
"k8s.io/ingress-nginx/test/e2e/framework"
)
var _ = framework.IngressNginxDescribe("Annotations - X-Forwarded-Prefix", func() {
var _ = framework.DescribeAnnotation("x-forwarded-prefix", func() {
f := framework.NewDefaultFramework("xforwardedprefix")
BeforeEach(func() {