fix: test failures

- fix issues with fake mounter in nodeserver tests
- fix errors in sanity script

Signed-off-by: Mayank Shah <[email protected]>

Author: mayankshah1607

.github/workflows/ubuntu.yml

@@ -36,7 +36,8 @@ jobs:
         make container
 
     - name: Get code coverage
+      env:
+          COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         GO111MODULE=off go get github.com/mattn/goveralls
-        sudo -E env "PATH=$PATH" go test -covermode=count -coverprofile=profile.cov ./pkg/...
-        $GOPATH/bin/goveralls -coverprofile=profile.cov -service=travis-ci
+        $(go env GOPATH)/bin/goveralls -coverprofile=profile.cov -service=github

.travis.yml

@@ -9,6 +9,6 @@ before_install:
   - GO111MODULE=off go get github.com/mattn/goveralls
 
 script:
-  - sudo -E env "PATH=$PATH" go test -covermode=count -coverprofile=profile.cov ./pkg/...
+  - go test -covermode=count -coverprofile=profile.cov ./pkg/...
   - $GOPATH/bin/goveralls -coverprofile=profile.cov -service=travis-ci
   - make container

Makefile

@@ -30,7 +30,7 @@ BUILD_DATE ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 LDFLAGS ?= "-X ${PKG}/pkg/blob.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/blob.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/blob.buildDate=${BUILD_DATE} -s -w -extldflags '-static'"
 E2E_HELM_OPTIONS ?= --set image.blob.pullPolicy=IfNotPresent --set image.blob.repository=$(REGISTRY)/$(IMAGE_NAME) --set image.blob.tag=$(IMAGE_VERSION)
 GINKGO_FLAGS = -ginkgo.noColor -ginkgo.v
-GO111MODULE = off
+GO111MODULE = on
 GOPATH ?= $(shell go env GOPATH)
 GOBIN ?= $(GOPATH)/bin
 DOCKER_CLI_EXPERIMENTAL = enabled
@@ -132,4 +132,4 @@ clean:
 
 .PHONY: create-metrics-svc
 create-metrics-svc:
-	kubectl create -f deploy/example/metrics/csi-blob-controller-svc.yaml
+	kubectl create -f deploy/example/metrics/csi-blob-controller-svc.yaml

pkg/blob/fake_mount.go

@@ -27,6 +27,17 @@ type fakeMounter struct {
 	mount.FakeMounter
 }
 
+// Mount overrides mount.FakeMounter.Mount.
+func (f *fakeMounter) Mount(source string, target string, fstype string, options []string) error {
+	if strings.Contains(source, "error_mount") {
+		return fmt.Errorf("fake Mount: source error")
+	} else if strings.Contains(target, "error_mount") {
+		return fmt.Errorf("fake Mount: target error")
+	}
+
+	return nil
+}
+
 // MountSensitive overrides mount.FakeMounter.MountSensitive.
 func (f *fakeMounter) MountSensitive(source string, target string, fstype string, options []string, sensitiveOptions []string) error {
 	if strings.Contains(source, "ut-container") {

pkg/blob/nodeserver_test.go

@@ -31,6 +31,7 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/stretchr/testify/assert"
 
+	testingexec "k8s.io/utils/exec/testing"
 	"k8s.io/utils/mount"
 )
 
@@ -186,7 +187,12 @@ func TestNodePublishVolume(t *testing.T) {
 	_ = makeDir(sourceTest)
 	_ = makeDir(targetTest)
 	d := NewFakeDriver()
-	d.mounter, _ = NewSafeMounter()
+	fakeMounter := &fakeMounter{}
+	fakeExec := &testingexec.FakeExec{ExactOrder: true}
+	d.mounter = &mount.SafeFormatAndMount{
+		Interface: fakeMounter,
+		Exec:      fakeExec,
+	}
 
 	for _, test := range tests {
 		_, err := d.NodePublishVolume(context.Background(), &test.req)
@@ -233,9 +239,13 @@ func TestNodeUnpublishVolume(t *testing.T) {
 	_ = makeDir(sourceTest)
 	_ = makeDir(targetTest)
 	d := NewFakeDriver()
-	d.mounter, _ = NewSafeMounter()
-	mountOptions := []string{"bind"}
-	_ = d.mounter.Mount(sourceTest, targetTest, "", mountOptions)
+
+	fakeMounter := &fakeMounter{}
+	fakeExec := &testingexec.FakeExec{ExactOrder: true}
+	d.mounter = &mount.SafeFormatAndMount{
+		Interface: fakeMounter,
+		Exec:      fakeExec,
+	}
 
 	for _, test := range tests {
 		_, err := d.NodeUnpublishVolume(context.Background(), &test.req)

test/sanity/run-test.sh

@@ -16,6 +16,15 @@
 
 set -eo pipefail
 
+function cleanup {
+  echo 'pkill -f blobplugin'
+  pkill -f blobplugin
+  echo 'Deleting CSI sanity test binary'
+  rm -rf csi-test
+}
+
+trap cleanup EXIT
+
 readonly endpoint="unix:///tmp/csi.sock"
 nodeid="CSINode"
 if [[ "$#" -gt 0 ]] && [[ -n "$1" ]]; then
@@ -25,4 +34,6 @@ fi
 _output/blobplugin --endpoint "$endpoint" --nodeid "$nodeid" -v=5 &
 
 echo "Begin to run sanity test..."
-csi-sanity --ginkgo.v --csi.endpoint=$endpoint -ginkgo.skip="should fail when requesting to create a volume with already existing name and different capacity"
+readonly CSI_SANITY_BIN='csi-test/cmd/csi-sanity/csi-sanity'
+"$CSI_SANITY_BIN" --ginkgo.v --csi.endpoint=$endpoint -ginkgo.skip="should fail when requesting to create a volume with already existing name and different capacity"
+

test/sanity/run-tests-all-clouds.sh

@@ -17,22 +17,13 @@
 set -eo pipefail
 
 function install_csi_sanity_bin {
-  mkdir -p $GOPATH/src/github.com/kubernetes-csi/csi-test
-  git clone https://github.com/kubernetes-csi/csi-test.git -b v2.2.0 $GOPATH/src/github.com/kubernetes-csi/csi-test
-  pushd $GOPATH/src/github.com/kubernetes-csi/csi-test/cmd/csi-sanity
-  make && make install
+  echo 'Installing CSI sanity test binary...'
+  git clone https://github.com/kubernetes-csi/csi-test.git -b v2.2.0
+  pushd csi-test/cmd/csi-sanity
+  make
   popd
 }
 
-function cleanup {
-  echo 'pkill -f blobplugin'
-  pkill -f blobplugin
-  echo 'Deleting CSI sanity test binary'
-  rm -rf $GOPATH/src/github.com/kubernetes-csi
-}
-
-trap cleanup EXIT
-
 # copy blobfuse binary
 mkdir -p /usr/blob
 cp test/artifacts/blobfuse /usr/bin/blobfuse