minio/mc
1
0
Fork 0
mirror of https://github.com/minio/mc.git synced 2025-11-13 12:22:45 +03:00
Code Activity

Full cleanup of s3 client for mc

Browse Source
This commit is contained in:
Harshavardhana
2015-05-01 15:52:08 -07:00
parent 28315e7492
commit 78a78c072a
23 changed files with 1008 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
cmd_test.go
View File

@@ -132,7 +132,7 @@ func (s *CmdTestSuite) TestCopyRecursive(c *C) {
wg.Done()
}()
items := []*client.Item{
contents := []*client.Content{
{Name: "hello1", Time: time.Now(), Size: dataLen1},
{Name: "hello2", Time: time.Now(), Size: dataLen2},
}
@@ -150,17 +150,17 @@ func (s *CmdTestSuite) TestCopyRecursive(c *C) {
targetURLConfigMap[targetURL] = targetConfig
methods.On("getNewClient", sourceURL, sourceConfig, false).Return(cl1, nil).Once()
itemCh := make(chan client.ItemOnChannel)
contentCh := make(chan client.ContentOnChannel)
go func() {
defer close(itemCh)
for _, item := range items {
itemCh <- client.ItemOnChannel{
Item: item,
Err: nil,
defer close(contentCh)
for _, content := range contents {
contentCh <- client.ContentOnChannel{
Content: content,
Err: nil,
}
}
}()
cl1.On("ListRecursive").Return(itemCh).Once()
cl1.On("ListRecursive").Return(contentCh).Once()
sourceReader1 := ioutil.NopCloser(bytes.NewBufferString(data1))
sourceReader2 := ioutil.NopCloser(bytes.NewBufferString(data2))
methods.On("getSourceReader", sourceURL+"hello1", sourceConfig).Return(sourceReader1, dataLen1, etag1, nil).Once()
@@ -281,7 +281,7 @@ func (s *CmdTestSuite) TestLsCmdWithBucket(c *C) {
data2 := "hello world 2"
dataLen2 := int64(len(data2))
items := []*client.Item{
contents := []*client.Content{
{Name: "hello1", Time: time.Now(), Size: dataLen1},
{Name: "hello2", Time: time.Now(), Size: dataLen2},
}
@@ -293,17 +293,17 @@ func (s *CmdTestSuite) TestLsCmdWithBucket(c *C) {
sourceURLConfigMap[sourceURL] = sourceConfig
methods.On("getNewClient", sourceURL, sourceConfig, false).Return(cl1, nil).Once()
itemCh := make(chan client.ItemOnChannel)
contentCh := make(chan client.ContentOnChannel)
go func() {
defer close(itemCh)
for _, item := range items {
itemCh <- client.ItemOnChannel{
Item: item,
Err: nil,
defer close(contentCh)
for _, content := range contents {
contentCh <- client.ContentOnChannel{
Content: content,
Err: nil,
}
}
}()
cl1.On("ListRecursive").Return(itemCh).Once()
cl1.On("ListRecursive").Return(contentCh).Once()
err = doListRecursiveCmd(methods, sourceURL, sourceConfig, false)
c.Assert(err, IsNil)
@@ -324,7 +324,7 @@ func (s *CmdTestSuite) TestLsCmdWithFilePath(c *C) {
data2 := "hello world 2"
dataLen2 := int64(len(data2))
items := []*client.Item{
contents := []*client.Content{
{Name: "hello1", Time: time.Now(), Size: dataLen1},
{Name: "hello2", Time: time.Now(), Size: dataLen2},
}
@@ -337,17 +337,17 @@ func (s *CmdTestSuite) TestLsCmdWithFilePath(c *C) {
methods.On("getNewClient", sourceURL, sourceConfig, false).Return(cl1, nil).Once()
itemCh := make(chan client.ItemOnChannel)
contentCh := make(chan client.ContentOnChannel)
go func() {
defer close(itemCh)
for _, item := range items {
itemCh <- client.ItemOnChannel{
Item: item,
Err: nil,
defer close(contentCh)
for _, content := range contents {
contentCh <- client.ContentOnChannel{
Content: content,
Err: nil,
}
}
}()
cl1.On("ListRecursive").Return(itemCh).Once()
cl1.On("ListRecursive").Return(contentCh).Once()
err = doListRecursiveCmd(methods, sourceURL, sourceConfig, false)
c.Assert(err, IsNil)
@@ -362,7 +362,7 @@ func (s *CmdTestSuite) TestLsCmdListsBuckets(c *C) {
methods := &MockclientMethods{}
cl1 := &clientMocks.Client{}
buckets := []*client.Item{
buckets := []*client.Content{
{Name: "bucket1", Time: time.Now()},
{Name: "bucket2", Time: time.Now()},
}
@@ -374,17 +374,17 @@ func (s *CmdTestSuite) TestLsCmdListsBuckets(c *C) {
sourceURLConfigMap[sourceURL] = sourceConfig
methods.On("getNewClient", sourceURL, sourceConfig, false).Return(cl1, nil).Once()
itemCh := make(chan client.ItemOnChannel)
contentCh := make(chan client.ContentOnChannel)
go func() {
defer close(itemCh)
defer close(contentCh)
for _, bucket := range buckets {
itemCh <- client.ItemOnChannel{
Item: bucket,
Err: nil,
contentCh <- client.ContentOnChannel{
Content: bucket,
Err: nil,
}
}
}()
cl1.On("ListRecursive").Return(itemCh).Once()
cl1.On("ListRecursive").Return(contentCh).Once()
err = doListRecursiveCmd(methods, sourceURL, sourceConfig, false)
c.Assert(err, IsNil)
@@ -406,7 +406,7 @@ func (s *CmdTestSuite) TestMbCmd(c *C) {
targetURLConfigMap[targetURL] = targetConfig
methods.On("getNewClient", targetURL, targetConfig, false).Return(cl1, nil).Once()
cl1.On("PutBucket", "").Return(nil).Once()
cl1.On("PutBucket").Return(nil).Once()
msg, err := doMakeBucketCmd(methods, targetURL, targetConfig, false)
c.Assert(msg, Equals, "")
c.Assert(err, IsNil)
@@ -429,19 +429,19 @@ func (s *CmdTestSuite) TestAccessCmd(c *C) {
targetURLConfigMap[targetURL] = targetConfig
methods.On("getNewClient", targetURL, targetConfig, false).Return(cl1, nil).Once()
cl1.On("PutBucket", "private").Return(nil).Once()
cl1.On("PutBucketACL", "private").Return(nil).Once()
msg, err := doUpdateAccessCmd(methods, targetURL, "private", targetConfig, false)
c.Assert(msg, Equals, "")
c.Assert(err, IsNil)
methods.On("getNewClient", targetURL, targetConfig, false).Return(cl1, nil).Once()
cl1.On("PutBucket", "public").Return(nil).Once()
cl1.On("PutBucketACL", "public").Return(nil).Once()
msg, err = doUpdateAccessCmd(methods, targetURL, "public", targetConfig, false)
c.Assert(msg, Equals, "")
c.Assert(err, IsNil)
methods.On("getNewClient", targetURL, targetConfig, false).Return(cl1, nil).Once()
cl1.On("PutBucket", "readonly").Return(nil).Once()
cl1.On("PutBucketACL", "readonly").Return(nil).Once()
msg, err = doUpdateAccessCmd(methods, targetURL, "readonly", targetConfig, false)
c.Assert(msg, Equals, "")
c.Assert(err, IsNil)
@@ -469,8 +469,8 @@ func (s *CmdTestSuite) TestAccessCmdFailures(c *C) {
c.Assert(err, Not(IsNil))
methods.On("getNewClient", targetURL, targetConfig, false).Return(cl1, nil).Once()
cl1.On("PutBucket", "private").Return(&net.DNSError{}).Once()
cl1.On("PutBucket", "private").Return(nil).Once()
cl1.On("PutBucketACL", "private").Return(&net.DNSError{}).Once()
cl1.On("PutBucketACL", "private").Return(nil).Once()
msg, err = doUpdateAccessCmd(methods, targetURL, "private", targetConfig, false)
c.Assert(msg, Equals, "")
c.Assert(err, IsNil)
@@ -484,7 +484,7 @@ func (s *CmdTestSuite) TestAccessCmdFailures(c *C) {
err.Op = "dial"
err.Net = "tcp"
err.Err = errors.New("Another expected error")
cl1.On("PutBucket", "private").Return(err).Once()
cl1.On("PutBucketACL", "private").Return(err).Once()
}
msg, err = doUpdateAccessCmd(methods, targetURL, "private", targetConfig, false)
globalMaxRetryFlag = retries
@@ -514,8 +514,8 @@ func (s *CmdTestSuite) TestMbCmdFailures(c *C) {
c.Assert(err, Not(IsNil))
methods.On("getNewClient", targetURL, targetConfig, false).Return(cl1, nil).Once()
cl1.On("PutBucket", "").Return(&net.DNSError{}).Once()
cl1.On("PutBucket", "").Return(nil).Once()
cl1.On("PutBucket").Return(&net.DNSError{}).Once()
cl1.On("PutBucket").Return(nil).Once()
msg, err = doMakeBucketCmd(methods, targetURL, targetConfig, false)
c.Assert(msg, Equals, "")
c.Assert(err, IsNil)
@@ -529,7 +529,7 @@ func (s *CmdTestSuite) TestMbCmdFailures(c *C) {
err.Op = "dial"
err.Net = "tcp"
err.Err = errors.New("Another expected error")
cl1.On("PutBucket", "").Return(err).Once()
cl1.On("PutBucket").Return(err).Once()
}
msg, err = doMakeBucketCmd(methods, targetURL, targetConfig, false)
globalMaxRetryFlag = retries
@@ -554,19 +554,19 @@ func (s *CmdTestSuite) TestAccessCmdOnFile(c *C) {
targetURLConfigMap[targetURL] = targetConfig
methods.On("getNewClient", targetURL, targetConfig, false).Return(cl1, nil).Once()
cl1.On("PutBucket", "private").Return(nil).Once()
cl1.On("PutBucketACL", "private").Return(nil).Once()
msg, err := doUpdateAccessCmd(methods, targetURL, "private", targetConfig, false)
c.Assert(msg, Equals, "")
c.Assert(err, IsNil)
methods.On("getNewClient", targetURL, targetConfig, false).Return(cl1, nil).Once()
cl1.On("PutBucket", "public").Return(nil).Once()
cl1.On("PutBucketACL", "public").Return(nil).Once()
msg, err = doUpdateAccessCmd(methods, targetURL, "public", targetConfig, false)
c.Assert(msg, Equals, "")
c.Assert(err, IsNil)
methods.On("getNewClient", targetURL, targetConfig, false).Return(cl1, nil).Once()
cl1.On("PutBucket", "readonly").Return(nil).Once()
cl1.On("PutBucketACL", "readonly").Return(nil).Once()
msg, err = doUpdateAccessCmd(methods, targetURL, "readonly", targetConfig, false)
c.Assert(msg, Equals, "")
c.Assert(err, IsNil)
@@ -589,7 +589,7 @@ func (s *CmdTestSuite) TestMbCmdOnFile(c *C) {
targetURLConfigMap[targetURL] = targetConfig
methods.On("getNewClient", targetURL, targetConfig, false).Return(cl1, nil).Once()
cl1.On("PutBucket", "").Return(nil).Once()
cl1.On("PutBucket").Return(nil).Once()
msg, err := doMakeBucketCmd(methods, targetURL, targetConfig, false)
c.Assert(msg, Equals, "")
c.Assert(err, IsNil)