Merge pull request #1269 from gnufied/fix-race-again

k8s-ci-robot · web-flow · commit 7982c591fed2 · 2024-09-06T08:21:22.000+01:00
Fix race in tests
diff --git a/pkg/controller/clone_controller_test.go b/pkg/controller/clone_controller_test.go
@@ -144,6 +144,8 @@ func TestCloneFinalizerRemoval(t *testing.T) {
 
 // TestEnqueueClaimUpadate ensure that PVCs will be processed for finalizer removal only on deletionTimestamp being set on the resource
 func TestEnqueueClaimUpadate(t *testing.T) {
+	utilruntime.ReallyCrash = false
+
 	testcases := map[string]struct {
 		claim    *v1.PersistentVolumeClaim
 		queueLen int
@@ -179,7 +181,6 @@ func TestEnqueueClaimUpadate(t *testing.T) {
 }
 
 func fakeCloningProtector(client *fakeclientset.Clientset, objects ...runtime.Object) *CloningProtectionController {
-	utilruntime.ReallyCrash = false
 	controllerCapabilities := rpc.ControllerCapabilitySet{
 		csi.ControllerServiceCapability_RPC_CLONE_VOLUME: true,
 	}

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,8 @@ func TestCloneFinalizerRemoval(t *testing.T) {`
`144`	`144`
`145`	`145`	`// TestEnqueueClaimUpadate ensure that PVCs will be processed for finalizer removal only on deletionTimestamp being set on the resource`
`146`	`146`	`func TestEnqueueClaimUpadate(t *testing.T) {`
	`147`	`+ utilruntime.ReallyCrash = false`
	`148`	`+`
`147`	`149`	`testcases := map[string]struct {`
`148`	`150`	`claim *v1.PersistentVolumeClaim`
`149`	`151`	`queueLen int`
`@@ -179,7 +181,6 @@ func TestEnqueueClaimUpadate(t *testing.T) {`
`179`	`181`	`}`
`180`	`182`
`181`	`183`	`func fakeCloningProtector(client fakeclientset.Clientset, objects ...runtime.Object) CloningProtectionController {`
`182`		`- utilruntime.ReallyCrash = false`
`183`	`184`	`controllerCapabilities := rpc.ControllerCapabilitySet{`
`184`	`185`	`csi.ControllerServiceCapability_RPC_CLONE_VOLUME: true,`
`185`	`186`	`}`