mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-08-08 23:37:11 +00:00
Merge pull request #134525 from omerap12/hpa-monitor-test-flake
Remove flaky HPA deletion assertion in TestMultipleHPAs
This commit is contained in:
@@ -5192,7 +5192,6 @@ func TestMultipleHPAs(t *testing.T) {
|
||||
const testNamespace = "dummy-namespace"
|
||||
|
||||
processed := make(chan string, hpaCount)
|
||||
processedDeleted := make(chan string, 1)
|
||||
|
||||
testClient := &fake.Clientset{}
|
||||
testScaleClient := &scalefake.FakeScaleClient{}
|
||||
@@ -5422,9 +5421,6 @@ func TestMultipleHPAs(t *testing.T) {
|
||||
})
|
||||
|
||||
testClient.AddReactor("delete", "horizontalpodautoscalers", func(action core.Action) (handled bool, ret runtime.Object, err error) {
|
||||
deleteAction := action.(core.DeleteAction)
|
||||
hpaName := deleteAction.GetName()
|
||||
processedDeleted <- hpaName
|
||||
return true, nil, nil
|
||||
})
|
||||
|
||||
@@ -5480,14 +5476,6 @@ func TestMultipleHPAs(t *testing.T) {
|
||||
// Simulate the watch event for deletion
|
||||
hpaWatcher.Delete(&hpaList[0])
|
||||
|
||||
// Wait for deletion to be processed
|
||||
select {
|
||||
case deletedHPAName := <-processedDeleted:
|
||||
assert.Equal(t, hpaName, deletedHPAName, "Expected the deleted HPA name to match")
|
||||
case <-time.After(5 * time.Second):
|
||||
t.Fatalf("Timeout waiting for HPA deletion to be processed")
|
||||
}
|
||||
|
||||
// Give the controller time to process the deletion and update the monitor
|
||||
assert.Eventually(t, func() bool {
|
||||
return hpaController.monitor.(*mockMonitor).GetObjectsCount() == hpaCount-1
|
||||
|
||||
Reference in New Issue
Block a user