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:
@@ -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"
|
||||
|
||||
|
Reference in New Issue
Block a user