From 7f17ef28a8b83ace1551eec9810bec34e3860810 Mon Sep 17 00:00:00 2001 From: Jonathan Basseri Date: Tue, 17 Mar 2020 12:09:45 -0700 Subject: [PATCH] Fix nil panic in vsphere tests During test cleanup, we iterate over nodes.Items, but if test fails during setup, nodes may be nil. --- test/e2e/storage/vsphere/vsphere_scale.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/storage/vsphere/vsphere_scale.go b/test/e2e/storage/vsphere/vsphere_scale.go index 9ea76b67328..19bbde5279e 100644 --- a/test/e2e/storage/vsphere/vsphere_scale.go +++ b/test/e2e/storage/vsphere/vsphere_scale.go @@ -23,7 +23,7 @@ import ( "github.com/onsi/ginkgo" "github.com/onsi/gomega" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" @@ -108,7 +108,7 @@ var _ = utils.SIGDescribe("vcp at scale [Feature:vsphere] ", func() { */ framework.AddCleanupAction(func() { // Cleanup actions will be called even when the tests are skipped and leaves namespace unset. - if len(namespace) > 0 { + if len(namespace) > 0 && nodes != nil { for _, node := range nodes.Items { framework.RemoveLabelOffNode(client, node.Name, NodeLabelKey) }