From b7d80823ccb4a7af0025af58fe008fc0768ea4f7 Mon Sep 17 00:00:00 2001 From: Ling Samuel Date: Fri, 18 Dec 2020 09:18:32 +0800 Subject: [PATCH] Reorder tests to avoid: `kubectl get nodes` reports outdated info causes test failure. Signed-off-by: Ling Samuel --- test/integration/main_test.go | 1 - test/integration/multinode_test.go | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/integration/main_test.go b/test/integration/main_test.go index 8bd7584c4db6..f0a1b9502cd5 100644 --- 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 index 3fa6fe289ac2..b17f1194e6d0 100644 --- 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}, }