From 81842de6d2ad528c78b4eb186aabfd923af7327a Mon Sep 17 00:00:00 2001 From: Kate Osborn Date: Wed, 21 Aug 2024 16:48:28 -0600 Subject: [PATCH 1/3] Increase test for traffic timeout --- tests/framework/timeout.go | 4 ++++ tests/suite/graceful_recovery_test.go | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/framework/timeout.go b/tests/framework/timeout.go index 69830237b1..956b1699f3 100644 --- a/tests/framework/timeout.go +++ b/tests/framework/timeout.go @@ -32,6 +32,9 @@ type TimeoutConfig struct { // GetStatusTimeout represents the maximum time for NGF to update the status of a resource. GetStatusTimeout time.Duration + + // TestForTrafficTimeout represents the maximum time for NGF to test for passing or failing traffic. + TestForTrafficTimeout time.Duration } // DefaultTimeoutConfig populates a TimeoutConfig with the default values. @@ -47,5 +50,6 @@ func DefaultTimeoutConfig() TimeoutConfig { ContainerRestartTimeout: 10 * time.Second, GetLeaderLeaseTimeout: 60 * time.Second, GetStatusTimeout: 60 * time.Second, + TestForTrafficTimeout: 60 * time.Second, } } diff --git a/tests/suite/graceful_recovery_test.go b/tests/suite/graceful_recovery_test.go index b7360175c1..6139dfcd4b 100644 --- a/tests/suite/graceful_recovery_test.go +++ b/tests/suite/graceful_recovery_test.go @@ -82,7 +82,7 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"), func() error { return checkForWorkingTraffic(teaURL, coffeeURL) }). - WithTimeout(timeoutConfig.RequestTimeout * 2). + WithTimeout(timeoutConfig.TestForTrafficTimeout). WithPolling(500 * time.Millisecond). Should(Succeed()) }) @@ -287,6 +287,7 @@ func checkForFailingTraffic(teaURL, coffeeURL string) error { func expectRequestToSucceed(appURL, address string, responseBodyMessage string) error { status, body, err := framework.Get(appURL, address, timeoutConfig.RequestTimeout) + if status != http.StatusOK { return errors.New("http status was not 200") } @@ -320,7 +321,7 @@ func checkNGFFunctionality(teaURL, coffeeURL, ngfPodName, containerName string, func() error { return checkForWorkingTraffic(teaURL, coffeeURL) }). - WithTimeout(timeoutConfig.RequestTimeout * 2). + WithTimeout(timeoutConfig.TestForTrafficTimeout). WithPolling(500 * time.Millisecond). Should(Succeed()) @@ -330,7 +331,7 @@ func checkNGFFunctionality(teaURL, coffeeURL, ngfPodName, containerName string, func() error { return checkForFailingTraffic(teaURL, coffeeURL) }). - WithTimeout(timeoutConfig.RequestTimeout). + WithTimeout(timeoutConfig.TestForTrafficTimeout). WithPolling(500 * time.Millisecond). Should(Succeed()) @@ -341,7 +342,7 @@ func checkNGFFunctionality(teaURL, coffeeURL, ngfPodName, containerName string, func() error { return checkForWorkingTraffic(teaURL, coffeeURL) }). - WithTimeout(timeoutConfig.RequestTimeout * 2). + WithTimeout(timeoutConfig.TestForTrafficTimeout). WithPolling(500 * time.Millisecond). Should(Succeed()) From a05c9616273e59171e2f4f44a715c2a75bf9d2a9 Mon Sep 17 00:00:00 2001 From: Kate Osborn Date: Wed, 21 Aug 2024 17:07:35 -0600 Subject: [PATCH 2/3] Print output of failed command --- tests/suite/graceful_recovery_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/suite/graceful_recovery_test.go b/tests/suite/graceful_recovery_test.go index 6139dfcd4b..0584af8f32 100644 --- a/tests/suite/graceful_recovery_test.go +++ b/tests/suite/graceful_recovery_test.go @@ -133,17 +133,18 @@ func runRestartNodeTest(teaURL, coffeeURL string, files []string, ns *core.Names } if drain { - _, err := exec.Command( + output, err := exec.Command( "kubectl", "drain", kindNodeName, "--ignore-daemonsets", "--delete-local-data", ).CombinedOutput() - Expect(err).ToNot(HaveOccurred()) - _, err = exec.Command("kubectl", "delete", "node", kindNodeName).CombinedOutput() - Expect(err).ToNot(HaveOccurred()) + Expect(err).ToNot(HaveOccurred(), string(output)) + + output, err = exec.Command("kubectl", "delete", "node", kindNodeName).CombinedOutput() + Expect(err).ToNot(HaveOccurred(), string(output)) } _, err = exec.Command("docker", "restart", containerName).CombinedOutput() From 22c88b9a5977d5674bf37dc0c2791fd0c3a41115 Mon Sep 17 00:00:00 2001 From: Kate Osborn Date: Wed, 21 Aug 2024 17:40:51 -0600 Subject: [PATCH 3/3] Fix kubectl drain command --- tests/suite/graceful_recovery_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/suite/graceful_recovery_test.go b/tests/suite/graceful_recovery_test.go index 0584af8f32..30fc3b79da 100644 --- a/tests/suite/graceful_recovery_test.go +++ b/tests/suite/graceful_recovery_test.go @@ -138,7 +138,7 @@ func runRestartNodeTest(teaURL, coffeeURL string, files []string, ns *core.Names "drain", kindNodeName, "--ignore-daemonsets", - "--delete-local-data", + "--delete-emptydir-data", ).CombinedOutput() Expect(err).ToNot(HaveOccurred(), string(output))