add context around test

test/e2e_node/allocatable_eviction_test.go

@@ -64,7 +64,9 @@ var _ = framework.KubeDescribe("AllocatableEviction [Slow] [Serial] [Disruptive]
 	}
 	evictionTestTimeout := 40 * time.Minute
 	testCondition := "Memory Pressure"
-	kubeletConfigUpdate := func(initialConfig *componentconfig.KubeletConfiguration) {
+
+	Context(fmt.Sprintf("when we run containers that should cause %s", testCondition), func() {
+		tempSetCurrentKubeletConfig(f, func(initialConfig *componentconfig.KubeletConfiguration) {
 			initialConfig.EvictionHard = "memory.available<10%"
 			// Set large system and kube reserved values to trigger allocatable thresholds far before hard eviction thresholds.
 			initialConfig.SystemReserved = componentconfig.ConfigurationMap(map[string]string{"memory": "1Gi"})
@@ -72,8 +74,12 @@ var _ = framework.KubeDescribe("AllocatableEviction [Slow] [Serial] [Disruptive]
 			initialConfig.EnforceNodeAllocatable = []string{cm.NodeAllocatableEnforcementKey}
 			initialConfig.ExperimentalNodeAllocatableIgnoreEvictionThreshold = false
 			initialConfig.CgroupsPerQOS = true
-	}
-	runEvictionTest(f, testCondition, podTestSpecs, evictionTestTimeout, hasMemoryPressure, kubeletConfigUpdate)
+		})
+		// Place the remainder of the test within a context so that the kubelet config is set before and after the test.
+		Context("With kubeconfig updated", func() {
+			runEvictionTest(f, testCondition, podTestSpecs, evictionTestTimeout, hasMemoryPressure)
+		})
+	})
 })
 
 // Returns TRUE if the node has Memory Pressure, FALSE otherwise

test/e2e_node/inode_eviction_test.go

@@ -113,11 +113,16 @@ var _ = framework.KubeDescribe("InodeEviction [Slow] [Serial] [Disruptive] [Flak
 	}
 	evictionTestTimeout := 30 * time.Minute
 	testCondition := "Disk Pressure due to Inodes"
-	kubeletConfigUpdate := func(initialConfig *componentconfig.KubeletConfiguration) {
-		initialConfig.EvictionHard = "nodefs.inodesFree<50%"
-	}
 
-	runEvictionTest(f, testCondition, podTestSpecs, evictionTestTimeout, hasInodePressure, kubeletConfigUpdate)
+	Context(fmt.Sprintf("when we run containers that should cause %s", testCondition), func() {
+		tempSetCurrentKubeletConfig(f, func(initialConfig *componentconfig.KubeletConfiguration) {
+			initialConfig.EvictionHard = "nodefs.inodesFree<50%"
+		})
+		// Place the remainder of the test within a context so that the kubelet config is set before and after the test.
+		Context("With kubeconfig updated", func() {
+			runEvictionTest(f, testCondition, podTestSpecs, evictionTestTimeout, hasInodePressure)
+		})
+	})
 })
 
 // Struct used by runEvictionTest that specifies the pod, and when that pod should be evicted, relative to other pods
@@ -136,11 +141,7 @@ type podTestSpec struct {
 //		It ensures that all lower evictionPriority pods are eventually evicted.
 // runEvictionTest then cleans up the testing environment by deleting provided nodes, and ensures that testCondition no longer exists
 func runEvictionTest(f *framework.Framework, testCondition string, podTestSpecs []podTestSpec, evictionTestTimeout time.Duration,
-	hasPressureCondition func(*framework.Framework, string) (bool, error), updateFunction func(initialConfig *componentconfig.KubeletConfiguration)) {
-
-	Context(fmt.Sprintf("when we run containers that should cause %s", testCondition), func() {
-
-		tempSetCurrentKubeletConfig(f, updateFunction)
+	hasPressureCondition func(*framework.Framework, string) (bool, error)) {
 	BeforeEach(func() {
 		By("seting up pods to be used by tests")
 		for _, spec := range podTestSpecs {
@@ -301,7 +302,6 @@ func runEvictionTest(f *framework.Framework, testCondition string, podTestSpecs
 			time.Sleep(postTestConditionMonitoringPeriod)
 		}
 	})
-	})
 }
 
 // Returns TRUE if the node has disk pressure due to inodes exists on the node, FALSE otherwise