From 8d4004bbc77d012642db97e09238f4f65a926bca Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Fri, 10 Mar 2023 11:02:59 -0600 Subject: [PATCH] wait: Update tests to reference the constant error The structure of the error is changing, and we don't guarantee reflect.DeepEqual(...) will remain true for ErrWaitTimeout currently. --- staging/src/k8s.io/client-go/tools/watch/until_test.go | 2 +- .../legacy-cloud-providers/azure/azure_instances_test.go | 3 ++- .../k8s.io/legacy-cloud-providers/azure/azure_routes_test.go | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/client-go/tools/watch/until_test.go b/staging/src/k8s.io/client-go/tools/watch/until_test.go index 2d64c423ac2..a9367a81817 100644 --- a/staging/src/k8s.io/client-go/tools/watch/until_test.go +++ b/staging/src/k8s.io/client-go/tools/watch/until_test.go @@ -209,7 +209,7 @@ func TestUntilWithSync(t *testing.T) { conditionFunc: func(e watch.Event) (bool, error) { return true, nil }, - expectedErr: errors.New("timed out waiting for the condition"), + expectedErr: wait.ErrWaitTimeout, expectedEvent: nil, }, { diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go index 6c47a37b763..c699d5c9d64 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances_test.go @@ -34,6 +34,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/wait" cloudprovider "k8s.io/cloud-provider" azcache "k8s.io/legacy-cloud-providers/azure/cache" "k8s.io/legacy-cloud-providers/azure/clients/interfaceclient/mockinterfaceclient" @@ -487,7 +488,7 @@ func TestNodeAddresses(t *testing.T) { metadataName: "vm1", vmType: vmTypeStandard, useInstanceMetadata: true, - expectedErrMsg: fmt.Errorf("timed out waiting for the condition"), + expectedErrMsg: wait.ErrWaitTimeout, }, { name: "NodeAddresses should get IP addresses from Azure API if node's name isn't equal to metadataName", diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_routes_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_routes_test.go index 4f2412feeae..2a0e1ccf381 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_routes_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_routes_test.go @@ -33,6 +33,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/apimachinery/pkg/util/wait" cloudprovider "k8s.io/cloud-provider" "k8s.io/legacy-cloud-providers/azure/clients/routetableclient/mockroutetableclient" "k8s.io/legacy-cloud-providers/azure/mockvmsets" @@ -226,7 +227,7 @@ func TestCreateRoute(t *testing.T) { name: "CreateRoute should report error if error occurs when invoke GetIPByNodeName", routeTableName: "rt7", getIPError: fmt.Errorf("getIP error"), - expectedErrMsg: fmt.Errorf("timed out waiting for the condition"), + expectedErrMsg: wait.ErrWaitTimeout, }, { name: "CreateRoute should add route to cloud.RouteCIDRs if node is unmanaged",