diff options
| author | Joshua Sjoding <joshua.sjoding@scjalliance.com> | 2016-02-24 22:40:30 -0800 |
|---|---|---|
| committer | Joshua Sjoding <joshua.sjoding@scjalliance.com> | 2016-02-25 00:38:51 -0800 |
| commit | 0d999e1db6cd8736ab697de8ce848fa3a5274b9f (patch) | |
| tree | 6107f49405bb605793f1bcd7ef4961ceadcb11e9 /storage/memory/storage_test.go | |
| parent | 07ca1ac7f3058ea6d3274a01973541fb84782f5e (diff) | |
| download | go-git-0d999e1db6cd8736ab697de8ce848fa3a5274b9f.tar.gz | |
Refactor to use core.ObjectReader and core.ObjectWriter
* New function signatures provide the necessary interface to stream data from disk when using filesystem-based storage in the future
* New function signatures provide proper error handling
* ObjectReader and ObjectWriter interfaces added to avoid future refactoring, currently are type aliases for io.ReadCloser and io.WriteCloser respectively
* Object.Reader now returns (ObjectReader, error)
* Object.Writer now returns (ObjectWriter, error)
* File.Contents now returns (string, error)
* File.Lines now returns ([]string, error)
* Blob.Reader now returns (core.ObjectReader, error)
* Added internal close helper function for deferred calls to Close that need to check the return value
Diffstat (limited to 'storage/memory/storage_test.go')
| -rw-r--r-- | storage/memory/storage_test.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/storage/memory/storage_test.go b/storage/memory/storage_test.go index ba7e224..f2fd3da 100644 --- a/storage/memory/storage_test.go +++ b/storage/memory/storage_test.go @@ -25,7 +25,12 @@ func (s *ObjectStorageSuite) TestSet(c *C) { o.SetType(core.CommitObject) o.SetSize(3) - o.Writer().Write([]byte("foo")) + + writer, err := o.Writer() + c.Assert(err, IsNil) + defer func() { c.Assert(writer.Close(), IsNil) }() + + writer.Write([]byte("foo")) h, err := os.Set(o) c.Assert(h.String(), Equals, "bc9968d75e48de59f0870ffb71f5e160bbbdcf52") @@ -39,7 +44,12 @@ func (s *ObjectStorageSuite) TestGet(c *C) { o.SetType(core.CommitObject) o.SetSize(3) - o.Writer().Write([]byte("foo")) + + writer, err := o.Writer() + c.Assert(err, IsNil) + defer func() { c.Assert(writer.Close(), IsNil) }() + + writer.Write([]byte("foo")) h, err := os.Set(o) c.Assert(err, IsNil) |