From e670608226185e07a04f392e7d6aa25ed4edc735 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Wed, 10 Dec 2014 17:43:16 -0800 Subject: [PATCH] Fixing build --- Makefile | 10 +++++++++- pkgs/storage/appendstorage/append_storage.go | 5 +++++ pkgs/storage/fsstorage/fs_storage_test.go | 18 ++++++++++-------- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 5a7fa2ccf..dd20f5679 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,16 @@ build-split: build-strbyteconv build-strbyteconv: @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/strbyteconv -cover: build-erasure build-signify build-split build-crc32c build-cpu build-sha1 +build-storage: build-storage-fs build-storage-append @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/storage + +build-storage-fs: + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/storage/fsstorage + +build-storage-append: + @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/storage/appendstorage + +cover: build-erasure build-signify build-split build-crc32c build-cpu build-sha1 build-storage @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkgs/gateway install: build-erasure diff --git a/pkgs/storage/appendstorage/append_storage.go b/pkgs/storage/appendstorage/append_storage.go index b38c20ad5..3b02af52b 100644 --- a/pkgs/storage/appendstorage/append_storage.go +++ b/pkgs/storage/appendstorage/append_storage.go @@ -3,6 +3,7 @@ package appendstorage import ( "bytes" "encoding/gob" + "errors" "io/ioutil" "os" "path" @@ -97,3 +98,7 @@ func (storage *appendStorage) Put(objectPath string, object []byte) error { ioutil.WriteFile(storage.objectsFile, mapBuffer.Bytes(), 0600) return nil } + +func (storage *appendStorage) GetList() ([]byte, error) { + return nil, errors.New("Not Implemented") +} diff --git a/pkgs/storage/fsstorage/fs_storage_test.go b/pkgs/storage/fsstorage/fs_storage_test.go index 5419cef47..e8335bdf7 100644 --- a/pkgs/storage/fsstorage/fs_storage_test.go +++ b/pkgs/storage/fsstorage/fs_storage_test.go @@ -1,26 +1,28 @@ package fsstorage import ( - . "gopkg.in/check.v1" "io/ioutil" "os" + + "github.com/minio-io/minio/pkgs/storage" + . "gopkg.in/check.v1" ) type FileSystemStorageSuite struct{} -var _ = Suite(&FileStorageSuite{}) +var _ = Suite(&FileSystemStorageSuite{}) func makeTempTestDir() (string, error) { return ioutil.TempDir("/tmp", "minio-test-") } -func (s *FileStorageSuite) TestFileStoragePutAtRootPath(c *C) { +func (s *FileSystemStorageSuite) TestFileStoragePutAtRootPath(c *C) { rootDir, err := makeTempTestDir() c.Assert(err, IsNil) defer os.RemoveAll(rootDir) - var storage ObjectStorage - storage = FileStorage{ + var storage storage.ObjectStorage + storage = FileSystemStorage{ RootDir: rootDir, } @@ -32,13 +34,13 @@ func (s *FileStorageSuite) TestFileStoragePutAtRootPath(c *C) { c.Assert(string(object1), Equals, "object1") } -func (s *FileStorageSuite) TestFileStoragePutDirPath(c *C) { +func (s *FileSystemStorageSuite) TestFileStoragePutDirPath(c *C) { rootDir, err := makeTempTestDir() c.Assert(err, IsNil) defer os.RemoveAll(rootDir) - var storage ObjectStorage - storage = FileStorage{ + var storage storage.ObjectStorage + storage = FileSystemStorage{ RootDir: rootDir, }