test: Fix Prefix Delegation enabling race condition (#5172)

aws · Nov 28, 2023 · f5f32bf · f5f32bf
1 parent d0497cd
commit f5f32bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/test/suites/scale/provisioning_test.go b/test/suites/scale/provisioning_test.go
@@ -72,6 +72,9 @@ var _ = Describe("Provisioning", Label(debug.NoWatch), Label(debug.NoEvents), fu
 		// that will be allocated across this large number of nodes, despite the fact that the ENI CIDR space will
 		// be extremely under-utilized
 		env.ExpectPrefixDelegationDisabled()
+		DeferCleanup(func() {
+			env.ExpectPrefixDelegationEnabled()
+		})
 
 		replicasPerNode := 1
 		expectedNodeCount := 500

diff --git a/test/suites/scale/suite_test.go b/test/suites/scale/suite_test.go
@@ -30,20 +30,20 @@ func TestScale(t *testing.T) {
 	RegisterFailHandler(Fail)
 	BeforeSuite(func() {
 		env = aws.NewEnvironment(t)
+		env.ExpectPrefixDelegationEnabled()
 		SetDefaultEventuallyTimeout(time.Hour)
 	})
 	AfterSuite(func() {
+		env.ExpectPrefixDelegationDisabled()
 		env.Stop()
 	})
 	RunSpecs(t, "Scale")
 }
 
 var _ = BeforeEach(func() {
-	env.ExpectPrefixDelegationEnabled()
 	env.BeforeEach()
 })
 var _ = AfterEach(func() { env.Cleanup() })
 var _ = AfterEach(func() {
 	env.AfterEach()
-	env.ExpectPrefixDelegationDisabled()
 })