fixing issue of feature gate not being turned off properly

2017-11-21 15:16:25 -05:00
parent c98aabccb0
commit 74fcd97c84
2 changed files with 6 additions and 6 deletions
--- a/pkg/controller/volume/persistentvolume/binder_test.go
+++ b/pkg/controller/volume/persistentvolume/binder_test.go
@@ -720,14 +720,9 @@ func TestSyncAlphaBlockVolume(t *testing.T) {
 		t.Errorf("Failed to enable feature gate for BlockVolume: %v", err)
 		return
 	}
+	defer utilfeature.DefaultFeatureGate.Set("BlockVolume=false")

 	runSyncTests(t, tests, []*storage.StorageClass{})
-
-	err1 := utilfeature.DefaultFeatureGate.Set("BlockVolume=false")
-	if err1 != nil {
-		t.Errorf("Failed to disable feature gate for BlockVolume: %v", err)
-		return
-	}
 }

 // Test multiple calls to syncClaim/syncVolume and periodic sync of all