diff options
Diffstat (limited to 'storage/memory')
-rw-r--r-- | storage/memory/storage.go | 5 | ||||
-rw-r--r-- | storage/memory/storage_test.go | 43 |
2 files changed, 14 insertions, 34 deletions
diff --git a/storage/memory/storage.go b/storage/memory/storage.go index 4fb6186..97e87c8 100644 --- a/storage/memory/storage.go +++ b/storage/memory/storage.go @@ -86,6 +86,10 @@ func (c *ConfigStorage) Remotes() ([]*config.RemoteConfig, error) { return o, nil } func (c *ConfigStorage) SetRemote(r *config.RemoteConfig) error { + if err := r.Validate(); err != nil { + return err + } + c.RemotesConfig[r.Name] = r return nil } @@ -124,7 +128,6 @@ func (o *ObjectStorage) Set(obj core.Object) (core.Hash, error) { case core.TagObject: o.Tags[h] = o.Objects[h] default: - fmt.Println(obj.Type()) return h, ErrUnsupportedObjectType } diff --git a/storage/memory/storage_test.go b/storage/memory/storage_test.go index 2c90738..e1d5a33 100644 --- a/storage/memory/storage_test.go +++ b/storage/memory/storage_test.go @@ -1,11 +1,9 @@ package memory import ( - "io" "testing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/core" "gopkg.in/src-d/go-git.v4/storage/test" ) @@ -18,7 +16,12 @@ type StorageSuite struct { var _ = Suite(&StorageSuite{}) func (s *StorageSuite) SetUpTest(c *C) { - s.BaseStorageSuite = test.NewBaseStorageSuite(NewStorage().ObjectStorage()) + storage := NewStorage() + s.BaseStorageSuite = test.NewBaseStorageSuite( + storage.ObjectStorage(), + storage.ReferenceStorage(), + storage.ConfigStorage(), + ) } func (s *StorageSuite) TestStorageObjectStorage(c *C) { @@ -37,36 +40,10 @@ func (s *StorageSuite) TestStorageReferenceStorage(c *C) { c.Assert(o == e, Equals, true) } -func (s *StorageSuite) TestReferenceStorageSetAndGet(c *C) { +func (s *StorageSuite) TestStorageConfigStorage(c *C) { storage := NewStorage() - rs := storage.ReferenceStorage() - - err := rs.Set(core.NewReferenceFromStrings("foo", "bc9968d75e48de59f0870ffb71f5e160bbbdcf52")) - c.Assert(err, IsNil) - - err = rs.Set(core.NewReferenceFromStrings("bar", "482e0eada5de4039e6f216b45b3c9b683b83bfa")) - c.Assert(err, IsNil) + o := storage.ConfigStorage() + e := storage.ConfigStorage() - e, err := rs.Get(core.ReferenceName("foo")) - c.Assert(err, IsNil) - c.Assert(e.Hash().String(), Equals, "bc9968d75e48de59f0870ffb71f5e160bbbdcf52") -} - -func (s *StorageSuite) TestReferenceStorageIter(c *C) { - storage := NewStorage() - rs := storage.ReferenceStorage() - - err := rs.Set(core.NewReferenceFromStrings("foo", "bc9968d75e48de59f0870ffb71f5e160bbbdcf52")) - c.Assert(err, IsNil) - - i, err := rs.Iter() - c.Assert(err, IsNil) - - e, err := i.Next() - c.Assert(err, IsNil) - c.Assert(e.Hash().String(), Equals, "bc9968d75e48de59f0870ffb71f5e160bbbdcf52") - - e, err = i.Next() - c.Assert(e, IsNil) - c.Assert(err, Equals, io.EOF) + c.Assert(o == e, Equals, true) } |