github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

e2e: accept context from Ginkgo

Browse Source 
Every ginkgo callback should return immediately when a timeout occurs or the
test run manually gets aborted with CTRL-C. To do that, they must take a ctx
parameter and pass it through to all code which might block.

This is a first automated step towards that: the additional parameter got added
with

    sed -i 's/\(framework.ConformanceIt\|ginkgo.It\)\(.*\)func() {$/\1\2func(ctx context.Context) {/' \
        $(git grep -l -e framework.ConformanceIt -e ginkgo.It )
    $GOPATH/bin/goimports -w $(git status | grep modified: | sed -e 's/.* //')

log_test.go was left unchanged.
This commit is contained in:
Patrick Ohly
2022-10-17 14:47:15 +02:00
parent 63ff4a2659
commit df5d84ae81
291 changed files with 1542 additions and 1454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/node/examples.go
View File

@@ -68,7 +68,7 @@ var _ = SIGDescribe("[Feature:Example]", func() {
})
ginkgo.Describe("Liveness", func() {
ginkgo.It("liveness pods should be automatically restarted", func() {
ginkgo.It("liveness pods should be automatically restarted", func(ctx context.Context) {
test := "test/fixtures/doc-yaml/user-guide/liveness"
execYaml := readFile(test, "exec-liveness.yaml.in")
httpYaml := readFile(test, "http-liveness.yaml.in")
@@ -115,7 +115,7 @@ var _ = SIGDescribe("[Feature:Example]", func() {
})
ginkgo.Describe("Secret", func() {
ginkgo.It("should create a pod that reads a secret", func() {
ginkgo.It("should create a pod that reads a secret", func(ctx context.Context) {
test := "test/fixtures/doc-yaml/user-guide/secrets"
secretYaml := readFile(test, "secret.yaml")
podYaml := readFile(test, "secret-pod.yaml.in")
@@ -135,7 +135,7 @@ var _ = SIGDescribe("[Feature:Example]", func() {
})
ginkgo.Describe("Downward API", func() {
ginkgo.It("should create a pod that prints his name and namespace", func() {
ginkgo.It("should create a pod that prints his name and namespace", func(ctx context.Context) {
test := "test/fixtures/doc-yaml/user-guide/downward-api"
podYaml := readFile(test, "dapi-pod.yaml.in")
podName := "dapi-test-pod"