mirror of
https://github.com/minio/minio.git
synced 2025-02-03 09:55:59 -05:00
Updating iodine
This commit is contained in:
parent
d909a0e297
commit
be229473b5
2
Godeps/Godeps.json
generated
2
Godeps/Godeps.json
generated
@ -20,7 +20,7 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/minio-io/iodine",
|
||||
"Rev": "f2dbd51c3b4f8530a9b8e2dbc32788175df2fa5c"
|
||||
"Rev": "d7c4850883ade19431e3808e9c712d3d3e69cdcc"
|
||||
},
|
||||
{
|
||||
"ImportPath": "gopkg.in/check.v1",
|
||||
|
2
Godeps/_workspace/src/github.com/minio-io/iodine/iodine.go
generated
vendored
2
Godeps/_workspace/src/github.com/minio-io/iodine/iodine.go
generated
vendored
@ -44,7 +44,7 @@ type StackEntry struct {
|
||||
|
||||
// Wrap an error, turning it into an iodine error.
|
||||
// Adds an initial stack trace.
|
||||
func Wrap(err error, data map[string]string) *Error {
|
||||
func New(err error, data map[string]string) *Error {
|
||||
entry := createStackEntry()
|
||||
for k, v := range data {
|
||||
entry.Data[k] = v
|
||||
|
2
Godeps/_workspace/src/github.com/minio-io/iodine/iodine_test.go
generated
vendored
2
Godeps/_workspace/src/github.com/minio-io/iodine/iodine_test.go
generated
vendored
@ -25,7 +25,7 @@ import (
|
||||
)
|
||||
|
||||
func TestIodine(t *testing.T) {
|
||||
iodineError := Wrap(errors.New("Hello"), nil)
|
||||
iodineError := New(errors.New("Hello"), nil)
|
||||
iodineError.Annotate(nil)
|
||||
iodineError.Annotate(nil)
|
||||
iodineError.Annotate(nil)
|
||||
|
2
Godeps/_workspace/src/gopkg.in/check.v1/benchmark_test.go
generated
vendored
2
Godeps/_workspace/src/gopkg.in/check.v1/benchmark_test.go
generated
vendored
@ -3,8 +3,8 @@
|
||||
package check_test
|
||||
|
||||
import (
|
||||
. "gopkg.in/check.v1"
|
||||
"time"
|
||||
. "gopkg.in/check.v1"
|
||||
)
|
||||
|
||||
var benchmarkS = Suite(&BenchmarkS{})
|
||||
|
17
Godeps/_workspace/src/gopkg.in/check.v1/printer_test.go
generated
vendored
17
Godeps/_workspace/src/gopkg.in/check.v1/printer_test.go
generated
vendored
@ -24,27 +24,22 @@ func printTestFunc() {
|
||||
println(3) // Comment3
|
||||
}
|
||||
switch 5 {
|
||||
case 6:
|
||||
println(6) // Comment6
|
||||
case 6: println(6) // Comment6
|
||||
println(7)
|
||||
}
|
||||
switch interface{}(9).(type) { // Comment9
|
||||
case int:
|
||||
println(10)
|
||||
switch interface{}(9).(type) {// Comment9
|
||||
case int: println(10)
|
||||
println(11)
|
||||
}
|
||||
select {
|
||||
case <-(chan bool)(nil):
|
||||
println(14)
|
||||
case <-(chan bool)(nil): println(14)
|
||||
println(15)
|
||||
default:
|
||||
println(16)
|
||||
default: println(16)
|
||||
println(17)
|
||||
}
|
||||
println(19,
|
||||
20)
|
||||
_ = func() {
|
||||
println(21)
|
||||
_ = func() { println(21)
|
||||
println(22)
|
||||
}
|
||||
println(24, func() {
|
||||
|
4
Godeps/_workspace/src/gopkg.in/check.v1/run_test.go
generated
vendored
4
Godeps/_workspace/src/gopkg.in/check.v1/run_test.go
generated
vendored
@ -400,7 +400,7 @@ func (s *RunS) TestStreamModeWithMiss(c *C) {
|
||||
// -----------------------------------------------------------------------
|
||||
// Verify that that the keep work dir request indeed does so.
|
||||
|
||||
type WorkDirSuite struct{}
|
||||
type WorkDirSuite struct {}
|
||||
|
||||
func (s *WorkDirSuite) Test(c *C) {
|
||||
c.MkDir()
|
||||
@ -411,7 +411,7 @@ func (s *RunS) TestKeepWorkDir(c *C) {
|
||||
runConf := RunConf{Output: &output, Verbose: true, KeepWorkDir: true}
|
||||
result := Run(&WorkDirSuite{}, &runConf)
|
||||
|
||||
c.Assert(result.String(), Matches, ".*\nWORK="+result.WorkDir)
|
||||
c.Assert(result.String(), Matches, ".*\nWORK=" + result.WorkDir)
|
||||
|
||||
stat, err := os.Stat(result.WorkDir)
|
||||
c.Assert(err, IsNil)
|
||||
|
@ -26,7 +26,7 @@ func NewDonut(root string) (Donut, *iodine.Error) {
|
||||
for nodeID, node := range nodes {
|
||||
bucketIDs, err := node.GetBuckets()
|
||||
if err != nil {
|
||||
return nil, iodine.Wrap(err, map[string]string{"root": root})
|
||||
return nil, iodine.New(err, map[string]string{"root": root})
|
||||
}
|
||||
for _, bucketID := range bucketIDs {
|
||||
tokens := strings.Split(bucketID, ":")
|
||||
@ -38,7 +38,7 @@ func NewDonut(root string) (Donut, *iodine.Error) {
|
||||
driver.buckets[tokens[0]] = bucket
|
||||
}
|
||||
if err = driver.buckets[tokens[0]].AddNode(nodeID, bucketID); err != nil {
|
||||
return nil, iodine.Wrap(err, map[string]string{"root": root})
|
||||
return nil, iodine.New(err, map[string]string{"root": root})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user