From 2f0094b97026214b36cacddbc736d8bd5bcc6dd9 Mon Sep 17 00:00:00 2001
From: Cecile Robert-Michon <cerobert@microsoft.com>
Date: Wed, 23 Jun 2021 11:18:07 -0700
Subject: [PATCH] Enable node drain timeout CAPI test

---
 test/e2e/capi_test.go          | 23 +++++++++++------------
 test/e2e/config/azure-dev.yaml |  1 +
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/e2e/capi_test.go b/test/e2e/capi_test.go
index 155b9384bba..1209264bb08 100644
--- a/test/e2e/capi_test.go
+++ b/test/e2e/capi_test.go
@@ -170,16 +170,15 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 		})
 	})
 
-	// TODO: enable this with a longer timeout once https://github.com/kubernetes-sigs/cluster-api/pull/4830 is imported.
-	//Context("Should successfully set and use node drain timeout", func() {
-	//	capi_e2e.NodeDrainTimeoutSpec(context.TODO(), func() capi_e2e.NodeDrainTimeoutSpecInput {
-	//		return capi_e2e.NodeDrainTimeoutSpecInput{
-	//			E2EConfig:             e2eConfig,
-	//			ClusterctlConfigPath:  clusterctlConfigPath,
-	//			BootstrapClusterProxy: bootstrapClusterProxy,
-	//			ArtifactFolder:        artifactFolder,
-	//			SkipCleanup:           skipCleanup,
-	//		}
-	//	})
-	//})
+	Context("Should successfully set and use node drain timeout", func() {
+		capi_e2e.NodeDrainTimeoutSpec(context.TODO(), func() capi_e2e.NodeDrainTimeoutSpecInput {
+			return capi_e2e.NodeDrainTimeoutSpecInput{
+				E2EConfig:             e2eConfig,
+				ClusterctlConfigPath:  clusterctlConfigPath,
+				BootstrapClusterProxy: bootstrapClusterProxy,
+				ArtifactFolder:        artifactFolder,
+				SkipCleanup:           skipCleanup,
+			}
+		})
+	})
 })
diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml
index f928f764117..8eee4874eb3 100644
--- a/test/e2e/config/azure-dev.yaml
+++ b/test/e2e/config/azure-dev.yaml
@@ -125,3 +125,4 @@ intervals:
   default/wait-job: ["5m", "10s"]
   default/wait-service: ["5m", "10s"]
   default/wait-machine-pool-nodes: ["30m", "10s"]
+  node-drain/wait-machine-deleted: [ "10m", "10s" ]