Reorder tests to avoid: kubectl get nodes reports outdated info cau…

…ses test failure. Signed-off-by: Ling Samuel <[email protected]>
kubernetes · Jan 11, 2021 · b7d8082 · b7d8082
1 parent 8ca38c3
commit b7d8082
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/test/integration/main_test.go b/test/integration/main_test.go
@@ -48,7 +48,6 @@ var testdataDir = flag.String("testdata-dir", "testdata", "the directory relativ
 const (
 	SecondNodeName = "m02"
 	ThirdNodeName  = "m03"
-	FourthNodeName = "m04"
 )
 
 // TestMain is the test main

diff --git a/test/integration/multinode_test.go b/test/integration/multinode_test.go
@@ -50,14 +50,17 @@ func TestMultiNode(t *testing.T) {
 			validator validatorFunc
 		}{
 			{"FreshStart2Nodes", validateMultiNodeStart},
+			// Add worker node
 			{"AddNode", validateAddNodeToMultiNode},
 			{"StopNode", validateStopRunningNode(ThirdNodeName)},
-			{"AddControlPlaneNode", validateAddControlPlaneNodeToMultiNode},
-			{"StopControlPlaneNode", validateStopRunningNode(FourthNodeName)},
 			{"StartAfterStop", validateStartNodeAfterStop(ThirdNodeName)},
-			{"StartControlPlaneAfterStop", validateStartNodeAfterStop(FourthNodeName)},
 			{"DeleteNode", validateDeleteNodeFromMultiNode(ThirdNodeName, true)},
-			{"DeleteControlPlaneNode", validateDeleteNodeFromMultiNode(FourthNodeName, true)},
+			// Add control plane node
+			{"AddControlPlaneNode", validateAddControlPlaneNodeToMultiNode},
+			{"StopControlPlaneNode", validateStopRunningNode(ThirdNodeName)},
+			{"StartControlPlaneAfterStop", validateStartNodeAfterStop(ThirdNodeName)},
+			{"DeleteControlPlaneNode", validateDeleteNodeFromMultiNode(ThirdNodeName, true)},
+			// Test cluster stop && start
 			{"StopMultiNode", validateStopMultiNodeCluster},
 			{"RestartMultiNode", validateRestartMultiNodeCluster},
 		}