Merge pull request #187 from andyzhangx/fix-windows-test

test: remove syscall due to build failure on Windows
kubernetes-sigs · Aug 3, 2020 · e2a7a00 · e2a7a00
2 parents 713aae5 + fb231b7
commit e2a7a00
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/deploy/example/statefulset.yaml b/deploy/example/statefulset.yaml
@@ -32,7 +32,7 @@ spec:
     - metadata:
         name: persistent-storage
         annotations:
-          volume.beta.kubernetes.io/storage-class: blobfuse.csi.azure.com
+          volume.beta.kubernetes.io/storage-class: blob
       spec:
         accessModes: ["ReadWriteOnce"]
         resources:

diff --git a/pkg/blobfuse/nodeserver_test.go b/pkg/blobfuse/nodeserver_test.go
@@ -21,7 +21,6 @@ import (
 	"errors"
 	"os"
 	"reflect"
-	"syscall"
 	"testing"
 
 	"google.golang.org/grpc/codes"
@@ -184,9 +183,10 @@ func TestNodePublishVolume(t *testing.T) {
 	}
 
 	// Clean up
-	_ = syscall.Unmount(sourceTest, syscall.MNT_DETACH)
-	_ = syscall.Unmount(targetTest, syscall.MNT_DETACH)
-	err := os.RemoveAll(sourceTest)
+	_ = d.mounter.Unmount(sourceTest)
+	err := d.mounter.Unmount(targetTest)
+	assert.NoError(t, err)
+	err = os.RemoveAll(sourceTest)
 	assert.NoError(t, err)
 	err = os.RemoveAll(targetTest)
 	assert.NoError(t, err)
@@ -232,8 +232,9 @@ func TestNodeUnpublishVolume(t *testing.T) {
 	}
 
 	//Clean up
-	_ = syscall.Unmount(targetTest, syscall.MNT_DETACH)
-	err := os.RemoveAll(sourceTest)
+	err := d.mounter.Unmount(targetTest)
+	assert.NoError(t, err)
+	err = os.RemoveAll(sourceTest)
 	assert.NoError(t, err)
 	err = os.RemoveAll(targetTest)
 	assert.NoError(t, err)