From 4f4cd5e63573da4d6edcc7d4213afaca67c19f88 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Mon, 23 Nov 2015 15:53:48 -0800 Subject: upgrading libs --- .../github.com/garyburd/redigo/redis/reply_test.go | 29 ++++++++++++++++------ 1 file changed, 21 insertions(+), 8 deletions(-) (limited to 'Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply_test.go') diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply_test.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply_test.go index 92744c590..83c0c7b98 100644 --- a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply_test.go +++ b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply_test.go @@ -19,8 +19,7 @@ import ( "reflect" "testing" - "github.com/garyburd/redigo/internal/redistest" - "github.com/garyburd/redigo/redis" + "github.com/mattermost/platform/Godeps/_workspace/src/github.com/garyburd/redigo/redis" ) type valueError struct { @@ -57,6 +56,16 @@ var replyTests = []struct { ve(redis.Strings(nil, nil)), ve([]string(nil), redis.ErrNil), }, + { + "byteslices([v1, v2])", + ve(redis.ByteSlices([]interface{}{[]byte("v1"), []byte("v2")}, nil)), + ve([][]byte{[]byte("v1"), []byte("v2")}, nil), + }, + { + "byteslices(nil)", + ve(redis.ByteSlices(nil, nil)), + ve([][]byte(nil), redis.ErrNil), + }, { "values([v1, v2])", ve(redis.Values([]interface{}{[]byte("v1"), []byte("v2")}, nil)), @@ -101,15 +110,16 @@ func TestReply(t *testing.T) { } } -// dial wraps DialTestDB() with a more suitable function name for examples. +// dial wraps DialDefaultServer() with a more suitable function name for examples. func dial() (redis.Conn, error) { - return redistest.Dial() + return redis.DialDefaultServer() } func ExampleBool() { c, err := dial() if err != nil { - panic(err) + fmt.Println(err) + return } defer c.Close() @@ -123,7 +133,8 @@ func ExampleBool() { func ExampleInt() { c, err := dial() if err != nil { - panic(err) + fmt.Println(err) + return } defer c.Close() @@ -140,7 +151,8 @@ func ExampleInt() { func ExampleInts() { c, err := dial() if err != nil { - panic(err) + fmt.Println(err) + return } defer c.Close() @@ -154,7 +166,8 @@ func ExampleInts() { func ExampleString() { c, err := dial() if err != nil { - panic(err) + fmt.Println(err) + return } defer c.Close() -- cgit v1.2.3-1-g7c22