e2e: accept context from Ginkgo

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

View File

@@ -122,7 +122,7 @@ var _ = SIGDescribe("ContainerLogPath [NodeConformance]", func() {
err := createAndWaitPod(makeLogPod(logPodName, logString))
framework.ExpectNoError(err, "Failed waiting for pod: %s to enter success state", logPodName)
})
ginkgo.It("should print log to correct log path", func() {
ginkgo.It("should print log to correct log path", func(ctx context.Context) {
logDir := kubelet.ContainerLogsDir
@@ -139,7 +139,7 @@ var _ = SIGDescribe("ContainerLogPath [NodeConformance]", func() {
framework.ExpectNoError(err, "Failed waiting for pod: %s to enter success state", logCheckPodName)
})
ginkgo.It("should print log to correct cri log path", func() {
ginkgo.It("should print log to correct cri log path", func(ctx context.Context) {
logCRIDir := "/var/log/pods"