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

migrate ginkgo to v2 (#8826)

Browse source 
* Migrate ginkgo to v2

* Update test/e2e/annotations/ipwhitelist.go

Co-authored-by: Jintao Zhang <tao12345666333@163.com>

* Update test/e2e/annotations/modsecurity/modsecurity.go

Co-authored-by: Jintao Zhang <tao12345666333@163.com>

* Update test/e2e/settings/access_log.go

Co-authored-by: Jintao Zhang <tao12345666333@163.com>

* remove unnecessary blank line

* re-order packages

* less change

Co-authored-by: Jintao Zhang <tao12345666333@163.com>
This commit is contained in:
Lien Li 2022-08-01 00:16:28 +08:00 • committed by GitHub
parent 5e6093cf59
commit 5b0cc8edca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
129 changed files with 152 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/e2e/framework/deployment.go
View file

@ -22,7 +22,7 @@ import (
"os"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"

2
test/e2e/framework/fastcgi_helloserver.go
View file

@ -17,7 +17,7 @@ limitations under the License.
package framework
import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"

8
test/e2e/framework/framework.go
View file

@ -23,7 +23,7 @@ import (
"time"
"github.com/gavv/httpexpect/v2"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
@ -161,7 +161,7 @@ func (f *Framework) AfterEach() {
}()
}(f.KubeClientSet, f.IngressClass)
if !ginkgo.CurrentGinkgoTestDescription().Failed {
if !ginkgo.CurrentSpecReport().Failed() {
return
}
@ -210,8 +210,8 @@ func DescribeSetting(text string, body func()) bool {
}
// MemoryLeakIt is wrapper function for ginkgo It. Adds "[MemoryLeak]" tag and makes static analysis easier.
func MemoryLeakIt(text string, body interface{}, timeout ...float64) bool {
return ginkgo.It(text+" [MemoryLeak]", body, timeout...)
func MemoryLeakIt(text string, body interface{}) bool {
return ginkgo.It(text+" [MemoryLeak]", body)
}
// GetNginxIP returns the number of TCP port where NGINX is running

2
test/e2e/framework/grpc_fortune_teller.go
View file

@ -17,7 +17,7 @@ limitations under the License.
package framework
import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"

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

@ -17,7 +17,7 @@ limitations under the License.
package framework
import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"

2
test/e2e/framework/k8s.go
View file

@ -22,7 +22,7 @@ import (
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
appsv1 "k8s.io/api/apps/v1"
api "k8s.io/api/core/v1"

2
test/e2e/framework/ssl.go
View file

@ -33,7 +33,7 @@ import (
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
"github.com/stretchr/testify/assert"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

4
test/e2e/framework/test_context.go
View file

@ -18,8 +18,6 @@ package framework
import (
"flag"
"github.com/onsi/ginkgo/config"
)
// TestContextType describes the client context to use in communications with the Kubernetes API.
@ -34,8 +32,6 @@ var TestContext TestContextType
// registerCommonFlags registers flags common to all e2e test suites.
func registerCommonFlags() {
config.GinkgoConfig.EmitSpecProgress = true
flag.StringVar(&TestContext.KubeHost, "kubernetes-host", "http://127.0.0.1:8080", "The kubernetes host, or apiserver, to connect to")
//flag.StringVar(&TestContext.KubeConfig, "kubernetes-config", os.Getenv(clientcmd.RecommendedConfigPathEnvVar), "Path to config containing embedded authinfo for kubernetes. Default value is from environment variable "+clientcmd.RecommendedConfigPathEnvVar)
flag.StringVar(&TestContext.KubeContext, "kubernetes-context", "", "config context to use for kubernetes. If unset, will use value from 'current-context'")

2
test/e2e/framework/util.go
View file

@ -22,7 +22,7 @@ import (
"os"
"time"
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/v2"
corev1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
rbacv1 "k8s.io/api/rbac/v1"