Externalized mountDir for easy testing

[#116222453]

Signed-off-by: James Myers <[email protected]>

Author: Nagapramod Mandagere

cmd/volman/main_suite_test.go

@@ -24,6 +24,7 @@ var driverServerPort int
 var debugServerAddress2 string
 var driverRunner *ginkgomon.Runner
 
+var mountDir string
 var tmpDriversPath string
 
 func TestVolman(t *testing.T) {
@@ -54,6 +55,9 @@ var _ = BeforeEach(func() {
 	tmpDriversPath, err = ioutil.TempDir("", "driversPath")
 	Expect(err).NotTo(HaveOccurred())
 
+	mountDir, err = ioutil.TempDir("", "mountDir")
+	Expect(err).NotTo(HaveOccurred())
+
 	driverServerPort = 9750 + GinkgoParallelNode()
 	debugServerAddress2 = fmt.Sprintf("0.0.0.0:%d", 9850+GinkgoParallelNode())
 	driverRunner = ginkgomon.New(ginkgomon.Config{
@@ -62,6 +66,7 @@ var _ = BeforeEach(func() {
 			driverPath,
 			"-listenAddr", fmt.Sprintf("0.0.0.0:%d", driverServerPort),
 			"-debugAddr", debugServerAddress2,
+			"-mountDir", mountDir,
 		),
 		StartCheck: "fakedriverServer.started",
 	})

fakedriver/cmd/fakedriver/main.go

@@ -34,9 +34,11 @@ var transport = flag.String(
 	"Transport protocol to transmit HTTP over",
 )
 
-func init() {
-	// no command line parsing can happen here in go 1.6git soll
-}
+var mountDir = flag.String(
+	"mountDir",
+	"/tmp/volumes",
+	"Path to directory where fake volumes are created",
+)
 
 func main() {
 	parseCommandLine()
@@ -49,12 +51,12 @@ func main() {
 	if *transport == "tcp" {
 		logger, logTap = newLogger()
 		defer logger.Info("ends")
-		fakeDriverServer = createFakeDriverServer(logger, *atAddress, *driversPath)
+		fakeDriverServer = createFakeDriverServer(logger, *atAddress, *driversPath, *mountDir)
 	} else {
 		logger, logTap = newUnixLogger()
 		defer logger.Info("ends")
 
-		fakeDriverServer = createFakeDriverUnixServer(logger, *atAddress, *driversPath)
+		fakeDriverServer = createFakeDriverUnixServer(logger, *atAddress, *driversPath, *mountDir)
 	}
 
 	servers := grouper.Members{
@@ -88,17 +90,17 @@ func processRunnerFor(servers grouper.Members) ifrit.Runner {
 	return sigmon.New(grouper.NewOrdered(os.Interrupt, servers))
 }
 
-func createFakeDriverServer(logger lager.Logger, atAddress string, driversPath string) ifrit.Runner {
+func createFakeDriverServer(logger lager.Logger, atAddress, driversPath, mountDir string) ifrit.Runner {
 	fileSystem := fakedriver.NewRealFileSystem()
-	client := fakedriver.NewLocalDriver(&fileSystem)
+	client := fakedriver.NewLocalDriver(&fileSystem, mountDir)
 	handler, err := driverhttp.NewHandler(logger, client)
 	exitOnFailure(logger, err)
 	return http_server.New(atAddress, handler)
 }
 
-func createFakeDriverUnixServer(logger lager.Logger, atAddress string, driversPath string) ifrit.Runner {
+func createFakeDriverUnixServer(logger lager.Logger, atAddress, driversPath, mountDir string) ifrit.Runner {
 	fileSystem := fakedriver.NewRealFileSystem()
-	client := fakedriver.NewLocalDriver(&fileSystem)
+	client := fakedriver.NewLocalDriver(&fileSystem, mountDir)
 	handler, err := driverhttp.NewHandler(logger, client)
 	exitOnFailure(logger, err)
 	return http_server.NewUnixServer(atAddress, handler)

fakedriver/local_driver.go

@@ -7,8 +7,6 @@ import (
 
 	"strings"
 
-	"path/filepath"
-
 	"github.com/cloudfoundry-incubator/volman/voldriver"
 	"github.com/pivotal-golang/lager"
 )
@@ -18,17 +16,19 @@ const RootDir = "_volumes/"
 type LocalDriver struct { // see voldriver.resources.go
 	volumes    map[string]*volume
 	fileSystem FileSystem
+	mountDir   string
 }
 
 type volume struct {
 	volumeID   string
 	mountpoint string
 }
 
-func NewLocalDriver(fileSystem FileSystem) *LocalDriver {
+func NewLocalDriver(fileSystem FileSystem, mountDir string) *LocalDriver {
 	return &LocalDriver{
 		volumes:    map[string]*volume{},
 		fileSystem: fileSystem,
+		mountDir:   mountDir,
 	}
 }
 
@@ -179,8 +179,7 @@ func (d *LocalDriver) exists(path string) (bool, error) {
 }
 
 func (d *LocalDriver) mountPath(logger lager.Logger, volumeId string) string {
-
-	dir, err := d.fileSystem.Abs(filepath.Dir(os.Args[0]))
+	dir, err := d.fileSystem.Abs(d.mountDir)
 	if err != nil {
 		logger.Fatal("error getting path to executable", err)
 	}

fakedriver/local_driver_test.go

@@ -18,12 +18,15 @@ var _ = Describe("Local Driver", func() {
 	var logger lager.Logger
 	var fakeFileSystem *volmanfakes.FakeFileSystem
 	var localDriver *fakedriver.LocalDriver
+	var mountDir string
 
 	BeforeEach(func() {
 		logger = lagertest.NewTestLogger("fakedriver-local")
 
+		mountDir = "/path/to/mount"
+
 		fakeFileSystem = &volmanfakes.FakeFileSystem{}
-		localDriver = fakedriver.NewLocalDriver(fakeFileSystem)
+		localDriver = fakedriver.NewLocalDriver(fakeFileSystem, mountDir)
 	})
 
 	Describe("Mount", func() {
@@ -277,7 +280,7 @@ var _ = Describe("Local Driver", func() {
 	})
 })
 
-func getUnsuccessful(logger lager.Logger, localDriver voldriver.Driver, volumeName string){
+func getUnsuccessful(logger lager.Logger, localDriver voldriver.Driver, volumeName string) {
 	getResponse := localDriver.Get(logger, voldriver.GetRequest{
 		Name: volumeName,
 	})
@@ -296,7 +299,7 @@ func getSuccessful(logger lager.Logger, localDriver voldriver.Driver, volumeName
 	return getResponse
 }
 
-func createSuccessful(logger lager.Logger, localDriver voldriver.Driver, volumeName string){
+func createSuccessful(logger lager.Logger, localDriver voldriver.Driver, volumeName string) {
 	createResponse := localDriver.Create(logger, voldriver.CreateRequest{
 		Name: volumeName,
 		Opts: map[string]interface{}{
@@ -306,10 +309,10 @@ func createSuccessful(logger lager.Logger, localDriver voldriver.Driver, volumeN
 	Expect(createResponse.Err).To(Equal(""))
 }
 
-func mountSuccessful(logger lager.Logger, localDriver voldriver.Driver, volumeName string, fakeFileSystem *volmanfakes.FakeFileSystem){
+func mountSuccessful(logger lager.Logger, localDriver voldriver.Driver, volumeName string, fakeFileSystem *volmanfakes.FakeFileSystem) {
 	fakeFileSystem.AbsReturns("/some/temp/dir", nil)
 	mountResponse := localDriver.Mount(logger, voldriver.MountRequest{
-	Name: volumeName,
+		Name: volumeName,
 	})
 	Expect(mountResponse.Err).To(Equal(""))
 	Expect(mountResponse.Mountpoint).To(Equal("/some/temp/dir/_volumes/test-volume-id"))