Adjust test cases

kubernetes-retired · Aug 9, 2018 · bcecfe2 · bcecfe2
1 parent 6e5600f
commit bcecfe2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/nfs/pkg/volume/provision.go b/nfs/pkg/volume/provision.go
@@ -127,7 +127,7 @@ func newNFSProvisionerInternal(exportDir string, client kubernetes.Interface, ou
 		quotaer:        quotaer,
 		serverHostname: serverHostname,
 		maxExports:     maxExports,
-		exportSubnet:	exportSubnet,
+		exportSubnet:   exportSubnet,
 		identity:       identity,
 		podIPEnv:       podIPEnv,
 		serviceEnv:     serviceEnv,

diff --git a/nfs/pkg/volume/provision_test.go b/nfs/pkg/volume/provision_test.go
@@ -200,7 +200,7 @@ func TestCreateVolume(t *testing.T) {
 		config:    conf,
 	}
 	maxExports := 3
-	p := newNFSProvisionerInternal(tmpDir+"/", client, false, exporter, newDummyQuotaer(), "", maxExports)
+	p := newNFSProvisionerInternal(tmpDir+"/", client, false, exporter, newDummyQuotaer(), "", maxExports, "*")
 
 	for _, test := range tests {
 		os.Setenv(test.envKey, "1.1.1.1")
@@ -344,7 +344,7 @@ func TestValidateOptions(t *testing.T) {
 	}
 
 	client := fake.NewSimpleClientset()
-	p := newNFSProvisionerInternal(tmpDir+"/", client, false, &testExporter{}, newDummyQuotaer(), "", -1)
+	p := newNFSProvisionerInternal(tmpDir+"/", client, false, &testExporter{}, newDummyQuotaer(), "", -1, "*")
 
 	for _, test := range tests {
 		gid, rootSquash, _, err := p.validateOptions(test.options)
@@ -403,7 +403,7 @@ func evaluateExportTests(t *testing.T, output string, checker func(*nfsProvision
 	}
 	for _, test := range tests {
 		client := fake.NewSimpleClientset()
-		p := newNFSProvisionerInternal(tmpDir+"/", client, false, &testExporter{exportMap: &exportMap{exportIDs: test.exportIDs}}, newDummyQuotaer(), "", test.maxExports)
+		p := newNFSProvisionerInternal(tmpDir+"/", client, false, &testExporter{exportMap: &exportMap{exportIDs: test.exportIDs}}, newDummyQuotaer(), "", test.maxExports, "*")
 		ok := checker(p)
 		evaluate(t, test.name, test.expectError, nil, test.expectedResult, ok, output)
 	}
@@ -459,7 +459,7 @@ func TestCreateDirectory(t *testing.T) {
 	}
 
 	client := fake.NewSimpleClientset()
-	p := newNFSProvisionerInternal(tmpDir+"/", client, false, &testExporter{}, newDummyQuotaer(), "", -1)
+	p := newNFSProvisionerInternal(tmpDir+"/", client, false, &testExporter{}, newDummyQuotaer(), "", -1, "*")
 
 	for _, test := range tests {
 		path := p.exportDir + test.directory
@@ -740,7 +740,7 @@ func TestGetServer(t *testing.T) {
 		}
 
 		client := fake.NewSimpleClientset(test.objs...)
-		p := newNFSProvisionerInternal(tmpDir+"/", client, test.outOfCluster, &testExporter{}, newDummyQuotaer(), test.serverHostname, -1)
+		p := newNFSProvisionerInternal(tmpDir+"/", client, test.outOfCluster, &testExporter{}, newDummyQuotaer(), test.serverHostname, -1, "*")
 
 		server, err := p.getServer()
 
@@ -826,7 +826,7 @@ func (e *testExporter) CanExport(limit int) bool {
 	return true
 }
 
-func (e *testExporter) AddExportBlock(path string, _ bool) (string, uint16, error) {
+func (e *testExporter) AddExportBlock(path string, _ bool, _ string) (string, uint16, error) {
 	id := uint16(1)
 	for ; id <= math.MaxUint16; id++ {
 		if _, ok := e.exportIDs[id]; !ok {