mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #114072 from Tal-or/deflake_e2e_cpumanager_metrics_tests
e2e: cpumanager: proper test clean-up
This commit is contained in:
commit
770b39c65b
@ -594,6 +594,12 @@ func runCPUManagerTests(f *framework.Framework) {
|
|||||||
err = e2epod.NewPodClient(f).MatchContainerOutput(pod.Name, pod.Spec.Containers[0].Name, expAllowedCPUsListRegex)
|
err = e2epod.NewPodClient(f).MatchContainerOutput(pod.Name, pod.Spec.Containers[0].Name, expAllowedCPUsListRegex)
|
||||||
framework.ExpectNoError(err, "expected log not found in container [%s] of pod [%s]",
|
framework.ExpectNoError(err, "expected log not found in container [%s] of pod [%s]",
|
||||||
pod.Spec.Containers[0].Name, pod.Name)
|
pod.Spec.Containers[0].Name, pod.Name)
|
||||||
|
|
||||||
|
deletePodSyncByName(f, pod.Name)
|
||||||
|
// we need to wait for all containers to really be gone so cpumanager reconcile loop will not rewrite the cpu_manager_state.
|
||||||
|
// this is in turn needed because we will have an unavoidable (in the current framework) race with the
|
||||||
|
// reconcile loop which will make our attempt to delete the state file and to restore the old config go haywire
|
||||||
|
waitForAllContainerRemoval(pod.Name, pod.Namespace)
|
||||||
})
|
})
|
||||||
|
|
||||||
ginkgo.It("should assign CPUs as expected with enhanced policy based on strict SMT alignment", func(ctx context.Context) {
|
ginkgo.It("should assign CPUs as expected with enhanced policy based on strict SMT alignment", func(ctx context.Context) {
|
||||||
|
Loading…
Reference in New Issue
Block a user