Use testing/synctest to eliminate waits in tests

.github/workflows/makefile.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: '1.24.0'
+          go-version: '1.25.8'
         id: go
 
       - name: Check out code into the Go module directory

Dockerfile

@@ -14,7 +14,7 @@
 
 ARG CI_IMAGE_REGISTRY
 
-FROM golang:1.24.0 as builder
+FROM golang:1.25.8 as builder
 
 ARG COMPONENT
 

Dockerfile_arm_all

@@ -1,6 +1,6 @@
 ARG CI_IMAGE_REGISTRY
 
-FROM golang:1.24.0 as builder
+FROM golang:1.25.8 as builder
 
 ARG COMPONENT
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/oracle/oci-cloud-controller-manager
 
-go 1.24.0
+go 1.25.0
 
 replace (
 	github.com/docker/distribution => github.com/docker/distribution v2.8.3+incompatible

pkg/csi/driver/bv_controller_test.go

@@ -21,6 +21,7 @@ import (
 	"reflect"
 	"strings"
 	"testing"
+	"testing/synctest"
 	"time"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
@@ -1226,27 +1227,29 @@ func TestControllerDriver_CreateVolume(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
-			defer cancel()
-			d := &BlockVolumeControllerDriver{ControllerDriver{
-				KubeClient: nil,
-				logger:     zap.S(),
-				config:     &providercfg.Config{CompartmentID: ""},
-				client:     NewClientProvisioner(nil, &MockBlockStorageClient{}, nil),
-				util:       &csi_util.Util{Logger: logging.Logger().Sugar()},
-			}}
-			got, err := d.CreateVolume(ctx, tt.args.req)
-			if tt.wantErr == nil && err != nil {
-				t.Errorf("got error %q, want none", err)
-			}
-			if tt.wantErr != nil && err == nil {
-				t.Errorf("want error %q, got none", tt.wantErr)
-			} else if tt.wantErr != nil && !strings.Contains(err.Error(), tt.wantErr.Error()) {
-				t.Errorf("want error %q to include %q", err, tt.wantErr)
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ControllerDriver.CreateVolume() = %v, want %v", got, tt.want)
-			}
+			synctest.Test(t, func(t *testing.T) {
+				ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
+				defer cancel()
+				d := &BlockVolumeControllerDriver{ControllerDriver{
+					KubeClient: nil,
+					logger:     zap.S(),
+					config:     &providercfg.Config{CompartmentID: ""},
+					client:     NewClientProvisioner(nil, &MockBlockStorageClient{}, nil),
+					util:       &csi_util.Util{Logger: logging.Logger().Sugar()},
+				}}
+				got, err := d.CreateVolume(ctx, tt.args.req)
+				if tt.wantErr == nil && err != nil {
+					t.Errorf("got error %q, want none", err)
+				}
+				if tt.wantErr != nil && err == nil {
+					t.Errorf("want error %q, got none", tt.wantErr)
+				} else if tt.wantErr != nil && !strings.Contains(err.Error(), tt.wantErr.Error()) {
+					t.Errorf("want error %q to include %q", err, tt.wantErr)
+				}
+				if !reflect.DeepEqual(got, tt.want) {
+					t.Errorf("ControllerDriver.CreateVolume() = %v, want %v", got, tt.want)
+				}
+			})
 		})
 	}
 }
@@ -1397,29 +1400,31 @@ func TestControllerDriver_ControllerPublishVolume(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
-			defer cancel()
-			d := &BlockVolumeControllerDriver{ControllerDriver{
-				KubeClient: &util.MockKubeClient{
-					CoreClient: &util.MockCoreClient{},
-				},
-				logger: zap.S(),
-				config: &providercfg.Config{CompartmentID: ""},
-				client: NewClientProvisioner(nil, &MockBlockStorageClient{}, nil),
-				util:   &csi_util.Util{Logger: logging.Logger().Sugar()},
-			}}
-			got, err := d.ControllerPublishVolume(ctx, tt.args.req)
-			if tt.wantErr == nil && err != nil {
-				t.Errorf("got error %q, want none", err)
-			}
-			if tt.wantErr != nil && err == nil {
-				t.Errorf("want error %q, got none", tt.wantErr)
-			} else if tt.wantErr != nil && !strings.Contains(err.Error(), tt.wantErr.Error()) {
-				t.Errorf("want error %q to include %q", err, tt.wantErr)
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ControllerDriver.ControllerPublish() = %v, want %v", got, tt.want)
-			}
+			synctest.Test(t, func(t *testing.T) {
+				ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
+				defer cancel()
+				d := &BlockVolumeControllerDriver{ControllerDriver{
+					KubeClient: &util.MockKubeClient{
+						CoreClient: &util.MockCoreClient{},
+					},
+					logger: zap.S(),
+					config: &providercfg.Config{CompartmentID: ""},
+					client: NewClientProvisioner(nil, &MockBlockStorageClient{}, nil),
+					util:   &csi_util.Util{Logger: logging.Logger().Sugar()},
+				}}
+				got, err := d.ControllerPublishVolume(ctx, tt.args.req)
+				if tt.wantErr == nil && err != nil {
+					t.Errorf("got error %q, want none", err)
+				}
+				if tt.wantErr != nil && err == nil {
+					t.Errorf("want error %q, got none", tt.wantErr)
+				} else if tt.wantErr != nil && !strings.Contains(err.Error(), tt.wantErr.Error()) {
+					t.Errorf("want error %q to include %q", err, tt.wantErr)
+				}
+				if !reflect.DeepEqual(got, tt.want) {
+					t.Errorf("ControllerDriver.ControllerPublish() = %v, want %v", got, tt.want)
+				}
+			})
 		})
 	}
 }
@@ -1471,29 +1476,31 @@ func TestControllerDriver_ControllerUnpublishVolume(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
-			defer cancel()
-			d := &BlockVolumeControllerDriver{ControllerDriver{
-				KubeClient: &util.MockKubeClient{
-					CoreClient: &util.MockCoreClient{},
-				},
-				logger: zap.S(),
-				config: &providercfg.Config{CompartmentID: ""},
-				client: NewClientProvisioner(nil, &MockBlockStorageClient{}, nil),
-				util:   &csi_util.Util{Logger: logging.Logger().Sugar()},
-			}}
-			got, err := d.ControllerUnpublishVolume(ctx, tt.args.req)
-			if tt.wantErr == nil && err != nil {
-				t.Errorf("got error %q, want none", err)
-			}
-			if tt.wantErr != nil && err == nil {
-				t.Errorf("want error %q, got none", tt.wantErr)
-			} else if tt.wantErr != nil && !strings.Contains(err.Error(), tt.wantErr.Error()) {
-				t.Errorf("want error %q to include %q", err, tt.wantErr)
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ControllerDriver.ControllerUnpublish() = %v, want %v", got, tt.want)
-			}
+			synctest.Test(t, func(t *testing.T) {
+				ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
+				defer cancel()
+				d := &BlockVolumeControllerDriver{ControllerDriver{
+					KubeClient: &util.MockKubeClient{
+						CoreClient: &util.MockCoreClient{},
+					},
+					logger: zap.S(),
+					config: &providercfg.Config{CompartmentID: ""},
+					client: NewClientProvisioner(nil, &MockBlockStorageClient{}, nil),
+					util:   &csi_util.Util{Logger: logging.Logger().Sugar()},
+				}}
+				got, err := d.ControllerUnpublishVolume(ctx, tt.args.req)
+				if tt.wantErr == nil && err != nil {
+					t.Errorf("got error %q, want none", err)
+				}
+				if tt.wantErr != nil && err == nil {
+					t.Errorf("want error %q, got none", tt.wantErr)
+				} else if tt.wantErr != nil && !strings.Contains(err.Error(), tt.wantErr.Error()) {
+					t.Errorf("want error %q to include %q", err, tt.wantErr)
+				}
+				if !reflect.DeepEqual(got, tt.want) {
+					t.Errorf("ControllerDriver.ControllerUnpublish() = %v, want %v", got, tt.want)
+				}
+			})
 		})
 	}
 }

pkg/csi/driver/fss_controller_test.go

@@ -21,6 +21,7 @@ import (
 	"reflect"
 	"strings"
 	"testing"
+	"testing/synctest"
 	"time"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
@@ -749,28 +750,30 @@ func TestFSSControllerDriver_CreateVolume(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
-		defer cancel()
 		t.Run(tt.name, func(t *testing.T) {
-			d := &FSSControllerDriver{ControllerDriver: ControllerDriver{
-				KubeClient: nil,
-				logger:     zap.S(),
-				config:     &providercfg.Config{CompartmentID: "", Auth: config.AuthConfig{TenancyID: tt.args.tenancyId}},
-				client:     NewClientProvisioner(nil, nil, &MockFileStorageClient{}),
-				util:       &csi_util.Util{},
-			}}
-			got, err := d.CreateVolume(ctx, tt.args.req)
-			if tt.wantErr == nil && err != nil {
-				t.Errorf("got error %q, want none", err)
-			}
-			if tt.wantErr != nil && err == nil {
-				t.Errorf("want error %q, got none", tt.wantErr)
-			} else if tt.wantErr != nil && !strings.Contains(err.Error(), tt.wantErr.Error()) {
-				t.Errorf("want error %q to include %q", err, tt.wantErr)
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ControllerDriver.CreateVolume() = %v, want %v", got, tt.want)
-			}
+			synctest.Test(t, func(t *testing.T) {
+				ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
+				defer cancel()
+				d := &FSSControllerDriver{ControllerDriver: ControllerDriver{
+					KubeClient: nil,
+					logger:     zap.S(),
+					config:     &providercfg.Config{CompartmentID: "", Auth: config.AuthConfig{TenancyID: tt.args.tenancyId}},
+					client:     NewClientProvisioner(nil, nil, &MockFileStorageClient{}),
+					util:       &csi_util.Util{},
+				}}
+				got, err := d.CreateVolume(ctx, tt.args.req)
+				if tt.wantErr == nil && err != nil {
+					t.Errorf("got error %q, want none", err)
+				}
+				if tt.wantErr != nil && err == nil {
+					t.Errorf("want error %q, got none", tt.wantErr)
+				} else if tt.wantErr != nil && !strings.Contains(err.Error(), tt.wantErr.Error()) {
+					t.Errorf("want error %q to include %q", err, tt.wantErr)
+				}
+				if !reflect.DeepEqual(got, tt.want) {
+					t.Errorf("ControllerDriver.CreateVolume() = %v, want %v", got, tt.want)
+				}
+			})
 		})
 	}
 }

pkg/util/mock_oci_clients.go

@@ -2,11 +2,19 @@ package util
 
 import (
 	"context"
+	"time"
+
 	"github.com/oracle/oci-go-sdk/v65/common"
 	"github.com/oracle/oci-go-sdk/v65/core"
 	"github.com/oracle/oci-go-sdk/v65/filestorage"
 )
 
+// mockPollInterval is the fake-time interval used by pagination mocks that
+// simulate an infinite page stream until context cancellation. It must be
+// smaller than testTimeout so the context expires after a few iterations when
+// running inside a testing/synctest bubble.
+const mockPollInterval = 5 * time.Second
+
 type MockOCIBlockStorageClient struct {
 	client core.BlockstorageClient
 }
@@ -22,10 +30,9 @@ type MockOCIFileStorageClient struct {
 func (c MockOCIFileStorageClient) ListMountTargets(ctx context.Context, request filestorage.ListMountTargetsRequest) (response filestorage.ListMountTargetsResponse, err error) {
 	if *request.DisplayName == "mount-target-idempotency-check-timeout-volume" {
 		select {
-		// from retry.go
 		case <-ctx.Done():
 			return response, ctx.Err()
-		default:
+		case <-time.After(mockPollInterval):
 			return filestorage.ListMountTargetsResponse{
 				Items: []filestorage.MountTargetSummary{
 					{
@@ -42,10 +49,9 @@ func (c MockOCIFileStorageClient) ListMountTargets(ctx context.Context, request
 func (c MockOCIFileStorageClient) ListFileSystems(ctx context.Context, request filestorage.ListFileSystemsRequest) (response filestorage.ListFileSystemsResponse, err error) {
 	if *request.DisplayName == "file-system-idempotency-check-timeout-volume" {
 		select {
-		// from retry.go
 		case <-ctx.Done():
 			return response, ctx.Err()
-		default:
+		case <-time.After(mockPollInterval):
 			return filestorage.ListFileSystemsResponse{
 				Items: []filestorage.FileSystemSummary{
 					{
@@ -62,10 +68,9 @@ func (c MockOCIFileStorageClient) ListFileSystems(ctx context.Context, request f
 func (c MockOCIFileStorageClient) ListExports(ctx context.Context, request filestorage.ListExportsRequest) (response filestorage.ListExportsResponse, err error) {
 	if *request.FileSystemId == "export-idempotency-check-timeout" {
 		select {
-		// from retry.go
 		case <-ctx.Done():
 			return response, ctx.Err()
-		default:
+		case <-time.After(mockPollInterval):
 			return filestorage.ListExportsResponse{
 				Items:       []filestorage.ExportSummary{},
 				OpcNextPage: common.String("a"),
@@ -78,10 +83,9 @@ func (c MockOCIFileStorageClient) ListExports(ctx context.Context, request files
 func (c MockOCIComputeClient) ListVolumeAttachments(ctx context.Context, request core.ListVolumeAttachmentsRequest) (response core.ListVolumeAttachmentsResponse, err error) {
 	if *request.VolumeId == "find-active-volume-attachment-timeout-volume" || *request.VolumeId == "find-volume-attachment-timeout" {
 		select {
-		// from retry.go
 		case <-ctx.Done():
 			return response, ctx.Err()
-		default:
+		case <-time.After(mockPollInterval):
 			return core.ListVolumeAttachmentsResponse{
 				Items: []core.VolumeAttachment{
 					core.IScsiVolumeAttachment{
@@ -116,10 +120,9 @@ func (c MockOCIComputeClient) GetVolumeAttachment(ctx context.Context, request c
 func (c *MockOCIBlockStorageClient) ListVolumes(ctx context.Context, request core.ListVolumesRequest) (response core.ListVolumesResponse, err error) {
 	if *request.DisplayName == "get-volumes-by-name-timeout-volume" {
 		select {
-		// from retry.go
 		case <-ctx.Done():
 			return response, ctx.Err()
-		default:
+		case <-time.After(mockPollInterval):
 			return core.ListVolumesResponse{
 				Items: []core.Volume{
 					{