From 7c656b55e49078918bebb7b58d8b9463c7f79fa3 Mon Sep 17 00:00:00 2001 From: Shiming Zhang Date: Fri, 12 Nov 2021 16:50:18 +0800 Subject: [PATCH] Update shutdown cases --- test/e2e_node/node_shutdown_linux_test.go | 35 ++++++++++------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/test/e2e_node/node_shutdown_linux_test.go b/test/e2e_node/node_shutdown_linux_test.go index ff616aeb949..eca0e681513 100644 --- a/test/e2e_node/node_shutdown_linux_test.go +++ b/test/e2e_node/node_shutdown_linux_test.go @@ -281,44 +281,39 @@ var _ = SIGDescribe("GracefulNodeShutdown [Serial] [NodeFeature:GracefulNodeShut // Define test pods pods := []*v1.Pod{ - getGracePeriodOverrideTestPod("period-120", nodeName, 120, ""), getGracePeriodOverrideTestPod("period-5", nodeName, 5, ""), - getGracePeriodOverrideTestPod("period-c-120", nodeName, 120, customClassC.Name), getGracePeriodOverrideTestPod("period-c-5", nodeName, 5, customClassC.Name), - getGracePeriodOverrideTestPod("period-b-120", nodeName, 120, customClassB.Name), getGracePeriodOverrideTestPod("period-b-5", nodeName, 5, customClassB.Name), - getGracePeriodOverrideTestPod("period-a-120", nodeName, 120, customClassA.Name), getGracePeriodOverrideTestPod("period-a-5", nodeName, 5, customClassA.Name), - getGracePeriodOverrideTestPod("period-critical-120", nodeName, 120, scheduling.SystemNodeCritical), getGracePeriodOverrideTestPod("period-critical-5", nodeName, 5, scheduling.SystemNodeCritical), } // Expected down steps downSteps := [][]string{ { - "period-5", "period-120", + "period-5", }, { - "period-5", "period-120", - "period-c-5", "period-c-120", + "period-5", + "period-c-5", }, { - "period-5", "period-120", - "period-c-5", "period-c-120", - "period-b-5", "period-b-120", + "period-5", + "period-c-5", + "period-b-5", }, { - "period-5", "period-120", - "period-c-5", "period-c-120", - "period-b-5", "period-b-120", - "period-a-5", "period-a-120", + "period-5", + "period-c-5", + "period-b-5", + "period-a-5", }, { - "period-5", "period-120", - "period-c-5", "period-c-120", - "period-b-5", "period-b-120", - "period-a-5", "period-a-120", - "period-critical-5", "period-critical-120", + "period-5", + "period-c-5", + "period-b-5", + "period-a-5", + "period-critical-5", }, }