Merge pull request #732 from avoltz/anvoltz/ut-fixes

fix race in unit test and add some simple tests for utils

Author: k8s-ci-robot

pkg/csi-common/utils_test.go

@@ -20,6 +20,8 @@ import (
 	"bytes"
 	"context"
 	"flag"
+	"io"
+	"os"
 	"testing"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
@@ -83,21 +85,9 @@ func TestParseEndpoint(t *testing.T) {
 }
 
 func TestLogGRPC(t *testing.T) {
-	// SET UP
-	klog.InitFlags(nil)
-	if e := flag.Set("logtostderr", "false"); e != nil {
-		t.Error(e)
-	}
-	if e := flag.Set("alsologtostderr", "false"); e != nil {
-		t.Error(e)
-	}
-	if e := flag.Set("v", "100"); e != nil {
-		t.Error(e)
-	}
-	flag.Parse()
-
 	buf := new(bytes.Buffer)
 	klog.SetOutput(buf)
+	defer klog.SetOutput(io.Discard)
 
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) { return nil, nil }
 	info := grpc.UnaryServerInfo{
@@ -232,3 +222,12 @@ func TestGetLogLevel(t *testing.T) {
 		}
 	}
 }
+
+func TestMain(m *testing.M) {
+	klog.InitFlags(nil)
+	_ = flag.Set("logtostderr", "false")
+	_ = flag.Set("alsologtostderr", "false")
+	_ = flag.Set("v", "100")
+	klog.SetOutput(io.Discard)
+	os.Exit(m.Run())
+}

pkg/util/util_test.go

@@ -146,6 +146,10 @@ func TestGetMountOptions(t *testing.T) {
 			options:  []string{""},
 			expected: "",
 		},
+		{
+			options:  []string{},
+			expected: "",
+		},
 	}
 
 	for _, test := range tests {
@@ -166,3 +170,47 @@ func TestMakeDir(t *testing.T) {
 	err = os.RemoveAll(targetTest)
 	assert.NoError(t, err)
 }
+
+func TestConvertTagsToMap(t *testing.T) {
+	type StringMap map[string]string
+	tests := []struct {
+		tags     string
+		expected map[string]string
+		err      bool
+	}{
+		{
+			tags:     "",
+			expected: StringMap{},
+			err:      false,
+		},
+		{
+			tags:     "key1=value1, key2=value2,key3= value3",
+			expected: StringMap{"key1": "value1", "key2": "value2", "key3": "value3"},
+			err:      false,
+		},
+		{
+			tags:     " key = value ",
+			expected: StringMap{"key": "value"},
+			err:      false,
+		},
+		{
+			tags:     "keyvalue",
+			expected: nil,
+			err:      true,
+		},
+		{
+			tags:     " = value,=",
+			expected: nil,
+			err:      true,
+		},
+	}
+	for _, test := range tests {
+		result, err := ConvertTagsToMap(test.tags)
+		if test.err {
+			assert.NotNil(t, err)
+		} else {
+			assert.Nil(t, err)
+		}
+		assert.Equal(t, result, test.expected)
+	}
+}