utils/fs: move 'os' and 'test' to separate packages. (#93)

* create utils/fs/test package to expose generic test suite to 3rd party fs implementations.
* move 'os' to its own package to avoid cyclic dependency (test -> fs -> test, becomes test -> fs, os -> test, os -> fs).
* remove TestCreateAndWrite: some of our implementations cannot read a file that was just created, written and not closed yet.

1 files changed, 0 insertions, 176 deletions

diff --git a/utils/fs/os.go b/utils/fs/os.go
deleted file mode 100644
index db45a1a..0000000
--- a/utils/fs/os.go
+++ /dev/null
@@ -1,176 +0,0 @@
-package fs
-
-import (
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-)
-
-// OS a filesystem base on the os filesystem
-type OS struct {
-	base string
-}
-
-// NewOS returns a new OS filesystem
-func NewOS(baseDir string) *OS {
-	return &OS{
-		base: baseDir,
-	}
-}
-
-// Create creates a new GlusterFSFile
-func (fs *OS) Create(filename string) (File, error) {
-	fullpath := path.Join(fs.base, filename)
-
-	if err := fs.createDir(fullpath); err != nil {
-		return nil, err
-	}
-
-	f, err := os.Create(fullpath)
-	if err != nil {
-		return nil, err
-	}
-
-	filename, err = filepath.Rel(fs.base, fullpath)
-	if err != nil {
-		return nil, err
-	}
-
-	return &OSFile{
-		BaseFile: BaseFile{filename: filename},
-		file:     f,
-	}, nil
-}
-
-func (fs *OS) createDir(fullpath string) error {
-	dir := filepath.Dir(fullpath)
-	if dir != "." {
-		if err := os.MkdirAll(dir, 0755); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ReadDir returns the filesystem info for all the archives under the specified
-// path.
-func (fs *OS) ReadDir(path string) ([]FileInfo, error) {
-	fullpath := fs.Join(fs.base, path)
-
-	l, err := ioutil.ReadDir(fullpath)
-	if err != nil {
-		return nil, err
-	}
-
-	var s = make([]FileInfo, len(l))
-	for i, f := range l {
-		s[i] = f
-	}
-
-	return s, nil
-}
-
-func (fs *OS) Rename(from, to string) error {
-	from = fs.Join(fs.base, from)
-	to = fs.Join(fs.base, to)
-
-	if err := fs.createDir(to); err != nil {
-		return err
-	}
-
-	return os.Rename(from, to)
-}
-
-// Open opens the named file for reading. If successful, methods on the returned
-// file can be used for reading only.
-func (fs *OS) Open(filename string) (File, error) {
-	fullpath := fs.Join(fs.base, filename)
-	f, err := os.Open(fullpath)
-	if err != nil {
-		return nil, err
-	}
-
-	return &OSFile{
-		BaseFile: BaseFile{filename: filename},
-		file:     f,
-	}, nil
-}
-
-// Stat returns the FileInfo structure describing file.
-func (fs *OS) Stat(filename string) (FileInfo, error) {
-	fullpath := fs.Join(fs.base, filename)
-	return os.Stat(fullpath)
-}
-
-func (fs *OS) TempFile(dir, prefix string) (File, error) {
-	fullpath := fs.Join(fs.base, dir)
-	if err := fs.createDir(fullpath + string(os.PathSeparator)); err != nil {
-		return nil, err
-	}
-
-	f, err := ioutil.TempFile(fullpath, prefix)
-	if err != nil {
-		return nil, err
-	}
-
-	s, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-
-	filename, err := filepath.Rel(fs.base, fs.Join(fullpath, s.Name()))
-	if err != nil {
-		return nil, err
-	}
-
-	return &OSFile{
-		BaseFile: BaseFile{filename: filename},
-		file:     f,
-	}, nil
-}
-
-// Join joins the specified elements using the filesystem separator.
-func (fs *OS) Join(elem ...string) string {
-	return filepath.Join(elem...)
-}
-
-// Dir returns a new Filesystem from the same type of fs using as baseDir the
-// given path
-func (fs *OS) Dir(path string) Filesystem {
-	return NewOS(fs.Join(fs.base, path))
-}
-
-// Base returns the base path of the filesytem
-func (fs *OS) Base() string {
-	return fs.base
-}
-
-// OSFile represents a file in the os filesystem
-type OSFile struct {
-	file *os.File
-	BaseFile
-}
-
-func (f *OSFile) Read(p []byte) (int, error) {
-	return f.file.Read(p)
-}
-
-func (f *OSFile) Seek(offset int64, whence int) (int64, error) {
-	return f.file.Seek(offset, whence)
-}
-
-func (f *OSFile) Write(p []byte) (int, error) {
-	return f.file.Write(p)
-}
-
-func (f *OSFile) Close() error {
-	f.closed = true
-
-	return f.file.Close()
-}
-
-func (f *OSFile) ReadAt(p []byte, off int64) (int, error) {
-	return f.file.ReadAt(p, off)
-}