From e973b05f8999c2f795303975bc255a6bbf52d931 Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Sat, 2 Nov 2024 09:50:11 +0100 Subject: [PATCH 1/2] Revert "Don't stop the next poll when it fails to grab logs" --- test/e2e/network/dns_common.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/e2e/network/dns_common.go b/test/e2e/network/dns_common.go index d83644e5063..75f9d097c9b 100644 --- a/test/e2e/network/dns_common.go +++ b/test/e2e/network/dns_common.go @@ -508,10 +508,7 @@ func assertFilesContain(ctx context.Context, fileNames []string, fileDir string, // grab logs from all the containers for _, container := range pod.Spec.Containers { logs, err := e2epod.GetPodLogs(ctx, client, pod.Namespace, pod.Name, container.Name) - if err != nil { - framework.Logf("Unable to get logs for %s: %v", container.Name, err) - continue - } + framework.ExpectNoError(err) framework.Logf("Pod client logs for %s: %s", container.Name, logs) } From 2c23db73118f958bd721151868011ac5480e89bf Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Sat, 2 Nov 2024 09:58:20 +0000 Subject: [PATCH 2/2] don't panic inside e2e test --- test/e2e/network/dns_common.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/network/dns_common.go b/test/e2e/network/dns_common.go index 75f9d097c9b..6e602370514 100644 --- a/test/e2e/network/dns_common.go +++ b/test/e2e/network/dns_common.go @@ -508,7 +508,9 @@ func assertFilesContain(ctx context.Context, fileNames []string, fileDir string, // grab logs from all the containers for _, container := range pod.Spec.Containers { logs, err := e2epod.GetPodLogs(ctx, client, pod.Namespace, pod.Name, container.Name) - framework.ExpectNoError(err) + if err != nil { + return false, fmt.Errorf("unexpected error getting pod client logs for %s: %v", container.Name, err) + } framework.Logf("Pod client logs for %s: %s", container.Name, logs) }