Merge pull request #58 from giulianvivan/utils-tempdir-implementation

utils/filesystem.go: "TempDir()" real implementation
UpdateHub · May 4, 2017 · d017bd0 · d017bd0
2 parents a737952 + 8a81d66
commit d017bd0
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 26 deletions.
diff --git a/installifdifferent/kernelfileinfo.go b/installifdifferent/kernelfileinfo.go
@@ -18,6 +18,7 @@ import (
 	"unicode"
 
 	"github.com/UpdateHub/updatehub/libarchive"
+	"github.com/UpdateHub/updatehub/utils"
 	"github.com/spf13/afero"
 )
 
@@ -69,7 +70,11 @@ func NewKernelFileInfo(fsb afero.Fs, filename string) (*KernelFileInfo, error) {
 		kfi.Type = zImageKernelType
 	}
 
-	version := kfi.captureVersion(file)
+	// since this uses only "TempDir()" we don't need to assign a
+	// value for the CmdlineExecuter
+	fsh := &utils.FileSystem{}
+
+	version := kfi.captureVersion(fsh, file)
 	re, _ := regexp.Compile(`(\d+.?\.[^\s]+)`)
 	matched := re.FindStringSubmatch(version)
 	if matched != nil && len(matched) == 2 {
@@ -147,7 +152,7 @@ func isx86zImage(file io.ReadSeeker) bool {
 
 // we can ignore errors here since if it fails, just means it is
 // not the image type being tested
-func (kfi *KernelFileInfo) captureVersion(file io.ReadSeeker) string {
+func (kfi *KernelFileInfo) captureVersion(fsh utils.FileSystemHelper, file io.ReadSeeker) string {
 	if kfi.Arch == ARMLinuxArch && kfi.Type == uImageKernelType {
 		file.Seek(32, io.SeekStart)
 		version := make([]byte, 32)
@@ -171,7 +176,7 @@ func (kfi *KernelFileInfo) captureVersion(file io.ReadSeeker) string {
 		gzippedFile.Write(content)
 		gzippedFile.Close()
 
-		tempdir, _ := afero.TempDir(kfi.FileSystemBackend, "", "kernelfileinfo")
+		tempdir, _ := fsh.TempDir(kfi.FileSystemBackend, "kernelfileinfo")
 		defer os.RemoveAll(tempdir)
 
 		// Decompress the gzipped kernel file

diff --git a/installmodes/copy/copy.go b/installmodes/copy/copy.go
@@ -78,7 +78,7 @@ func (cp *CopyObject) Install(downloadDir string) error {
 		}
 	}
 
-	tempDirPath, err := cp.TempDir("copy-handler")
+	tempDirPath, err := cp.TempDir(cp.FileSystemBackend, "copy-handler")
 	if err != nil {
 		return err
 	}

diff --git a/installmodes/copy/copy_test.go b/installmodes/copy/copy_test.go
@@ -103,7 +103,7 @@ func TestCopyInstallWithTempDirError(t *testing.T) {
 	cm := &copymock.CopierMock{}
 
 	fsm := &filesystemmock.FileSystemHelperMock{}
-	fsm.On("TempDir", "copy-handler").Return("", fmt.Errorf("temp dir error"))
+	fsm.On("TempDir", memFs, "copy-handler").Return("", fmt.Errorf("temp dir error"))
 	cp := CopyObject{FileSystemHelper: fsm, Copier: cm, FileSystemBackend: memFs, LibArchiveBackend: lam}
 
 	err := cp.Install("/dummy-download-dir")
@@ -129,7 +129,7 @@ func TestCopyInstallWithMountError(t *testing.T) {
 	mountOptions := "-o rw"
 
 	fsm := &filesystemmock.FileSystemHelperMock{}
-	fsm.On("TempDir", "copy-handler").Return(tempDirPath, nil)
+	fsm.On("TempDir", memFs, "copy-handler").Return(tempDirPath, nil)
 	fsm.On("Mount", targetDevice, tempDirPath, fsType, mountOptions).Return(fmt.Errorf("mount error"))
 	cp := CopyObject{FileSystemHelper: fsm, Copier: cm, FileSystemBackend: memFs, LibArchiveBackend: lam}
 	cp.Target = targetDevice
@@ -165,7 +165,7 @@ func TestCopyInstallWithCopyFileError(t *testing.T) {
 	compressed := false
 
 	fsm := &filesystemmock.FileSystemHelperMock{}
-	fsm.On("TempDir", "copy-handler").Return(tempDirPath, nil)
+	fsm.On("TempDir", memFs, "copy-handler").Return(tempDirPath, nil)
 	fsm.On("Mount", targetDevice, tempDirPath, fsType, mountOptions).Return(nil)
 	fsm.On("Umount", tempDirPath).Return(nil)
 
@@ -218,7 +218,7 @@ func TestCopyInstallWithUmountError(t *testing.T) {
 	compressed := false
 
 	fsm := &filesystemmock.FileSystemHelperMock{}
-	fsm.On("TempDir", "copy-handler").Return(tempDirPath, nil)
+	fsm.On("TempDir", memFs, "copy-handler").Return(tempDirPath, nil)
 	fsm.On("Mount", targetDevice, tempDirPath, fsType, mountOptions).Return(nil)
 	fsm.On("Umount", tempDirPath).Return(fmt.Errorf("umount error"))
 
@@ -271,7 +271,7 @@ func TestCopyInstallWithCopyFileANDUmountErrors(t *testing.T) {
 	compressed := false
 
 	fsm := &filesystemmock.FileSystemHelperMock{}
-	fsm.On("TempDir", "copy-handler").Return(tempDirPath, nil)
+	fsm.On("TempDir", memFs, "copy-handler").Return(tempDirPath, nil)
 	fsm.On("Mount", targetDevice, tempDirPath, fsType, mountOptions).Return(nil)
 	fsm.On("Umount", tempDirPath).Return(fmt.Errorf("umount error"))
 
@@ -389,7 +389,7 @@ func TestCopyInstallWithSuccess(t *testing.T) {
 			if tc.MustFormat {
 				fsm.On("Format", tc.Target, tc.FSType, tc.FormatOptions).Return(nil)
 			}
-			fsm.On("TempDir", "copy-handler").Return(tempDirPath, nil)
+			fsm.On("TempDir", memFs, "copy-handler").Return(tempDirPath, nil)
 			fsm.On("Mount", tc.Target, tempDirPath, tc.FSType, tc.MountOptions).Return(nil)
 			fsm.On("Umount", tempDirPath).Return(nil)
 

diff --git a/installmodes/tarball/tarball.go b/installmodes/tarball/tarball.go
@@ -99,7 +99,7 @@ func (tb *TarballObject) Install(downloadDir string) error {
 		}
 	}
 
-	tempDirPath, err := tb.TempDir("tarball-handler")
+	tempDirPath, err := tb.TempDir(tb.FileSystemBackend, "tarball-handler")
 	if err != nil {
 		return err
 	}

diff --git a/installmodes/tarball/tarball_test.go b/installmodes/tarball/tarball_test.go
@@ -194,7 +194,7 @@ func TestTarballInstallWithTempDirError(t *testing.T) {
 	cm := &copymock.CopierMock{}
 
 	fsm := &filesystemmock.FileSystemHelperMock{}
-	fsm.On("TempDir", "tarball-handler").Return("", fmt.Errorf("temp dir error"))
+	fsm.On("TempDir", memFs, "tarball-handler").Return("", fmt.Errorf("temp dir error"))
 	tb := TarballObject{
 		FileSystemHelper:  fsm,
 		Copier:            cm,
@@ -223,7 +223,7 @@ func TestTarballInstallWithMountError(t *testing.T) {
 	mountOptions := "-o rw"
 
 	fsm := &filesystemmock.FileSystemHelperMock{}
-	fsm.On("TempDir", "tarball-handler").Return(tempDirPath, nil)
+	fsm.On("TempDir", memFs, "tarball-handler").Return(tempDirPath, nil)
 	fsm.On("Mount", targetDevice, tempDirPath, fsType, mountOptions).Return(fmt.Errorf("mount error"))
 	tb := TarballObject{
 		FileSystemHelper:  fsm,
@@ -263,7 +263,7 @@ func TestTarballInstallWithExtractError(t *testing.T) {
 	sourcePath := path.Join(downloadDir, sha256sum)
 
 	fsm := &filesystemmock.FileSystemHelperMock{}
-	fsm.On("TempDir", "tarball-handler").Return(tempDirPath, nil)
+	fsm.On("TempDir", memFs, "tarball-handler").Return(tempDirPath, nil)
 	fsm.On("Mount", targetDevice, tempDirPath, fsType, mountOptions).Return(nil)
 	fsm.On("Umount", tempDirPath).Return(nil)
 
@@ -314,7 +314,7 @@ func TestTarballInstallWithUmountError(t *testing.T) {
 	sourcePath := path.Join(downloadDir, sha256sum)
 
 	fsm := &filesystemmock.FileSystemHelperMock{}
-	fsm.On("TempDir", "tarball-handler").Return(tempDirPath, nil)
+	fsm.On("TempDir", memFs, "tarball-handler").Return(tempDirPath, nil)
 	fsm.On("Mount", targetDevice, tempDirPath, fsType, mountOptions).Return(nil)
 	fsm.On("Umount", tempDirPath).Return(fmt.Errorf("umount error"))
 
@@ -365,7 +365,7 @@ func TestTarballInstallWithUnpackANDUmountErrors(t *testing.T) {
 	sourcePath := path.Join(downloadDir, sha256sum)
 
 	fsm := &filesystemmock.FileSystemHelperMock{}
-	fsm.On("TempDir", "tarball-handler").Return(tempDirPath, nil)
+	fsm.On("TempDir", memFs, "tarball-handler").Return(tempDirPath, nil)
 	fsm.On("Mount", targetDevice, tempDirPath, fsType, mountOptions).Return(nil)
 	fsm.On("Umount", tempDirPath).Return(fmt.Errorf("umount error"))
 
@@ -416,7 +416,7 @@ func TestTarballInstallWithSuccess(t *testing.T) {
 	sourcePath := path.Join(downloadDir, sha256sum)
 
 	fsm := &filesystemmock.FileSystemHelperMock{}
-	fsm.On("TempDir", "tarball-handler").Return(tempDirPath, nil)
+	fsm.On("TempDir", memFs, "tarball-handler").Return(tempDirPath, nil)
 	fsm.On("Mount", targetDevice, tempDirPath, fsType, mountOptions).Return(nil)
 	fsm.On("Umount", tempDirPath).Return(nil)
 

diff --git a/testsmocks/filesystemmock/helper.go b/testsmocks/filesystemmock/helper.go
@@ -8,7 +8,10 @@
 
 package filesystemmock
 
-import "github.com/stretchr/testify/mock"
+import (
+	"github.com/spf13/afero"
+	"github.com/stretchr/testify/mock"
+)
 
 type FileSystemHelperMock struct {
 	mock.Mock
@@ -29,7 +32,7 @@ func (fsm *FileSystemHelperMock) Umount(mountPath string) error {
 	return args.Error(0)
 }
 
-func (fsm *FileSystemHelperMock) TempDir(prefix string) (string, error) {
-	args := fsm.Called(prefix)
+func (fsm *FileSystemHelperMock) TempDir(fsb afero.Fs, prefix string) (string, error) {
+	args := fsm.Called(fsb, prefix)
 	return args.String(0), args.Error(1)
 }
diff --git a/utils/filesystem.go b/utils/filesystem.go
@@ -21,16 +21,17 @@ static int errno_wrapper() {
 import "C"
 import (
 	"fmt"
-	"io/ioutil"
 	"os/exec"
 	"strings"
 	"unsafe"
+
+	"github.com/spf13/afero"
 )
 
 type FileSystemHelper interface {
 	Format(targetDevice string, fsType string, formatOptions string) error
 	Mount(targetDevice string, mountPath string, fsType string, mountOptions string) error
-	TempDir(prefix string) (string, error)
+	TempDir(fsb afero.Fs, prefix string) (string, error)
 	Umount(mountPath string) error
 }
 
@@ -120,8 +121,6 @@ func (fs *FileSystem) Umount(mountPath string) error {
 	return nil
 }
 
-func (fs *FileSystem) TempDir(prefix string) (string, error) {
-	// FIXME: test this
-	// FIXME: use afero.Fs (receive through parameter here or on struct?)
-	return ioutil.TempDir("", prefix)
+func (fs *FileSystem) TempDir(fsb afero.Fs, prefix string) (string, error) {
+	return afero.TempDir(fsb, "", prefix)
 }