Fix ns teardown on SIGTERM and review comments

Author: prydie

test/e2e/e2e_test.go

@@ -19,11 +19,12 @@ package e2e
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo"
 	"github.com/onsi/gomega"
 
 	"k8s.io/apiserver/pkg/util/logs"
 
+	"github.com/oracle/oci-cloud-controller-manager/test/e2e/framework"
 	"github.com/oracle/oci-cloud-controller-manager/test/e2e/framework/ginkgowrapper"
 )
 
@@ -32,5 +33,10 @@ func TestE2E(t *testing.T) {
 	defer logs.FlushLogs()
 
 	gomega.RegisterFailHandler(ginkgowrapper.Fail)
-	RunSpecs(t, "CCM E2E suite")
+	ginkgo.RunSpecs(t, "CCM E2E suite")
 }
+
+var _ = ginkgo.SynchronizedAfterSuite(func() {
+	framework.Logf("Running AfterSuite actions on all node")
+	framework.RunCleanupActions()
+}, func() {})

test/e2e/framework/framework.go

@@ -126,6 +126,10 @@ func (f *Framework) CreateNamespace(baseName string, labels map[string]string) (
 func (f *Framework) DeleteNamespace(namespace string, timeout time.Duration) error {
 	startTime := time.Now()
 	if err := f.ClientSet.CoreV1().Namespaces().Delete(namespace, nil); err != nil {
+		if apierrors.IsNotFound(err) {
+			Logf("Namespace %v was already deleted", namespace)
+			return nil
+		}
 		return err
 	}
 
@@ -180,35 +184,28 @@ func (f *Framework) AfterEach() {
 
 	// DeleteNamespace at the very end in defer, to avoid any expectation
 	// failures preventing deleting the namespace.
-	defer func() {
-		nsDeletionErrors := map[string]error{}
-
-		if deleteNamespace {
-			// TODO: skip namespace deletion
-			for _, ns := range f.namespacesToDelete {
-				By(fmt.Sprintf("Destroying namespace %q for this suite.", ns.Name))
-				if err := f.DeleteNamespace(ns.Name, 5*time.Minute); err != nil {
-					if !apierrors.IsNotFound(err) {
-						nsDeletionErrors[ns.Name] = err
-					} else {
-						Logf("Namespace %v was already deleted", ns.Name)
-					}
-				}
+	nsDeletionErrors := map[string]error{}
+
+	if deleteNamespace {
+		for _, ns := range f.namespacesToDelete {
+			By(fmt.Sprintf("Destroying namespace %q for this suite.", ns.Name))
+			if err := f.DeleteNamespace(ns.Name, 5*time.Minute); err != nil {
+				nsDeletionErrors[ns.Name] = err
 			}
 		}
+	}
 
-		// Paranoia -- prevent reuse!
-		f.Namespace = nil
-		f.ClientSet = nil
-		f.namespacesToDelete = nil
+	// Paranoia -- prevent reuse!
+	f.Namespace = nil
+	f.ClientSet = nil
+	f.namespacesToDelete = nil
 
-		// if we had errors deleting, report them now.
-		if len(nsDeletionErrors) != 0 {
-			messages := []string{}
-			for namespaceKey, namespaceErr := range nsDeletionErrors {
-				messages = append(messages, fmt.Sprintf("Couldn't delete ns: %q: %s (%#v)", namespaceKey, namespaceErr, namespaceErr))
-			}
-			Failf(strings.Join(messages, ","))
+	// if we had errors deleting, report them now.
+	if len(nsDeletionErrors) != 0 {
+		messages := []string{}
+		for namespaceKey, namespaceErr := range nsDeletionErrors {
+			messages = append(messages, fmt.Sprintf("Couldn't delete ns: %q: %s (%#v)", namespaceKey, namespaceErr, namespaceErr))
 		}
-	}()
+		Failf(strings.Join(messages, ","))
+	}
 }

test/e2e/framework/networking_utils.go

@@ -190,6 +190,7 @@ func TestReachableUDP(ip string, port int, request string, expect string) (bool,
 	if err != nil {
 		return false, fmt.Errorf("Failed to dial %s: %v", ipPort, err)
 	}
+	defer con.Close()
 
 	_, err = con.Write([]byte(fmt.Sprintf("%s\n", request)))
 	if err != nil {
@@ -235,6 +236,7 @@ func TestNotReachableUDP(ip string, port int, request string) (bool, error) {
 		Logf("Confirmed that %s is not reachable", uri)
 		return true, nil
 	}
+	defer con.Close()
 
 	_, err = con.Write([]byte(fmt.Sprintf("%s\n", request)))
 	if err != nil {