Merge pull request #131575 from ali-a-a/deflake-watch-not-hanging-on-startup-failure

pkg/storage/cacher/cacher_whitebox_test: deflake TestWatchNotHangingOnStartupFailure when ResilientWatchCacheInitialization is on

Kubernetes-commit: 417662ca933ca58437d3d2d902f2cfdc4294ac45
This commit is contained in:
Kubernetes Publisher 2025-05-06 12:53:29 -07:00
commit 007464aa0f
3 changed files with 7 additions and 7 deletions

4
go.mod
View File

@ -50,8 +50,8 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1
k8s.io/api v0.0.0-20250503031400-f7e72be095ee
k8s.io/apimachinery v0.0.0-20250506191157-e07849993d77
k8s.io/client-go v0.0.0-20250506191944-2d0ad1ac54ea
k8s.io/component-base v0.0.0-20250503032835-394b28e84ba2
k8s.io/client-go v0.0.0-20250506232031-bf3d45b702d8
k8s.io/component-base v0.0.0-20250506232724-41c27b0c0716
k8s.io/klog/v2 v2.130.1
k8s.io/kms v0.0.0-20250401105328-de9f6e9dd930
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff

8
go.sum
View File

@ -371,10 +371,10 @@ k8s.io/api v0.0.0-20250503031400-f7e72be095ee h1:+YExLdNpiASfnQXQfpyLIGIps0RcJPN
k8s.io/api v0.0.0-20250503031400-f7e72be095ee/go.mod h1:AsuSCzGYZszSLf5GB+qx8FBGGirk0I/TZUkQJFsPRAQ=
k8s.io/apimachinery v0.0.0-20250506191157-e07849993d77 h1:bwypcAN4gpWZ8VRVrgr0tYmunGNRCD869R3/h5o2Qa4=
k8s.io/apimachinery v0.0.0-20250506191157-e07849993d77/go.mod h1:b+h1nads2hmyfwvvorkgHUriRTTaJ2p2mk0l03sESn8=
k8s.io/client-go v0.0.0-20250506191944-2d0ad1ac54ea h1:aMwjT5s9LQfXcA5Uwm4lqnMhm7i1dHxCdd48GwM7ed4=
k8s.io/client-go v0.0.0-20250506191944-2d0ad1ac54ea/go.mod h1:uX91j8XTGmdZmKa16H99QJ5W5lFV657dfka2v4AHS74=
k8s.io/component-base v0.0.0-20250503032835-394b28e84ba2 h1:Sn22KR7kHIivpSgJYqNzt5d2mBYBipLAXLK02SlVqHM=
k8s.io/component-base v0.0.0-20250503032835-394b28e84ba2/go.mod h1:WgzO+P6/OI1nAOmj6BPnmaioKc8o9E9RdXNOCfIOV4U=
k8s.io/client-go v0.0.0-20250506232031-bf3d45b702d8 h1:9KiguLGjtQSlrKS5YzQ8cIdUaHZz3rZztpWRNS90pvs=
k8s.io/client-go v0.0.0-20250506232031-bf3d45b702d8/go.mod h1:uX91j8XTGmdZmKa16H99QJ5W5lFV657dfka2v4AHS74=
k8s.io/component-base v0.0.0-20250506232724-41c27b0c0716 h1:0LG0V3rheo9y8JjS/ctgwDV7nMwNSDYZrhVsnF14yjE=
k8s.io/component-base v0.0.0-20250506232724-41c27b0c0716/go.mod h1:ixlAoEBnaWknNSypfBH2FgM5gtsw5uS1lTwicOVoIF4=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kms v0.0.0-20250401105328-de9f6e9dd930 h1:fSkCeVALAEKjgAQlWTPkmnEXXogqOQAaL5biUinfToA=

View File

@ -987,7 +987,7 @@ func TestWatchNotHangingOnStartupFailure(t *testing.T) {
t.Errorf("Unexpected error: %#v", err)
}
} else {
if err == nil || err.Error() != apierrors.NewTooManyRequests("storage is (re)initializing", 1).Error() {
if err == nil || !strings.Contains(err.Error(), "storage is (re)initializing") {
t.Errorf("Unexpected error: %#v", err)
}
}