Merge pull request #187 from mesosphere/sreis/node-unit-tests

Add unit tests for node service.

pkg/driver/controller_test.go

@@ -268,7 +268,7 @@ func TestCreateVolume(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Logf("Test case: %s", tc.name)
-		awsDriver := NewFakeDriver("")
+		awsDriver := NewFakeDriver("", NewFakeMounter())
 
 		resp, err := awsDriver.CreateVolume(context.TODO(), tc.req)
 		if err != nil {
@@ -353,7 +353,7 @@ func TestDeleteVolume(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Logf("Test case: %s", tc.name)
-		awsDriver := NewFakeDriver("")
+		awsDriver := NewFakeDriver("", NewFakeMounter())
 		_, err := awsDriver.DeleteVolume(context.TODO(), tc.req)
 		if err != nil {
 			srvErr, ok := status.FromError(err)

pkg/driver/fakes.go

@@ -22,25 +22,29 @@ import (
 	"k8s.io/kubernetes/pkg/util/mount"
 )
 
-func NewFakeMounter() *mount.SafeFormatAndMount {
+func NewFakeMounter() *mount.FakeMounter {
+	return &mount.FakeMounter{
+		MountPoints: []mount.MountPoint{},
+		Log:         []mount.FakeAction{},
+	}
+}
+
+func NewFakeSafeFormatAndMounter(fakeMounter *mount.FakeMounter) *mount.SafeFormatAndMount {
 	return &mount.SafeFormatAndMount{
-		Interface: &mount.FakeMounter{
-			MountPoints: []mount.MountPoint{},
-			Log:         []mount.FakeAction{},
-		},
-		Exec: mount.NewFakeExec(nil),
+		Interface: fakeMounter,
+		Exec:      mount.NewFakeExec(nil),
 	}
 
 }
 
 // NewFakeDriver creates a new mock driver used for testing
-func NewFakeDriver(endpoint string) *Driver {
+func NewFakeDriver(endpoint string, fakeMounter *mount.FakeMounter) *Driver {
 	cloud := cloud.NewFakeCloudProvider()
 	return &Driver{
 		endpoint: endpoint,
 		nodeID:   cloud.GetMetadata().GetInstanceID(),
 		cloud:    cloud,
-		mounter:  NewFakeMounter(),
+		mounter:  NewFakeSafeFormatAndMounter(fakeMounter),
 		inFlight: internal.NewInFlight(),
 	}
 }