diff --git a/redis_test.go b/redis_test.go index e4c9f09f..8946301f 100644 --- a/redis_test.go +++ b/redis_test.go @@ -1886,7 +1886,7 @@ func (t *RedisTest) TestPubSub(c *C) { //------------------------------------------------------------------------------ -func (t *RedisTest) TestPipelining(c *C) { +func (t *RedisTest) TestPipeline(c *C) { set := t.client.Set("foo2", "bar2") c.Assert(set.Err(), IsNil) c.Assert(set.Val(), Equals, "OK") @@ -1911,7 +1911,18 @@ func (t *RedisTest) TestPipelining(c *C) { c.Assert(getReq.Val(), Equals, "bar2") } -func (t *RedisTest) TestRunQueuedOnEmptyQueue(c *C) { +func (t *RedisTest) TestPipelineErrValNotSet(c *C) { + pipeline, err := t.client.PipelineClient() + c.Assert(err, IsNil) + defer func() { + c.Assert(pipeline.Close(), IsNil) + }() + + get := pipeline.Get("foo") + c.Check(get.Err(), Equals, redis.ErrValNotSet) +} + +func (t *RedisTest) TestPipelineRunQueuedOnEmptyQueue(c *C) { pipeline, err := t.client.PipelineClient() c.Assert(err, IsNil) defer func() { @@ -1923,7 +1934,7 @@ func (t *RedisTest) TestRunQueuedOnEmptyQueue(c *C) { c.Assert(reqs, HasLen, 0) } -func (t *RedisTest) TestIncrPipeliningFromGoroutines(c *C) { +func (t *RedisTest) TestPipelineIncrFromGoroutines(c *C) { pipeline, err := t.client.PipelineClient() c.Assert(err, IsNil) defer func() { @@ -1954,7 +1965,7 @@ func (t *RedisTest) TestIncrPipeliningFromGoroutines(c *C) { c.Assert(get.Val(), Equals, "20000") } -func (t *RedisTest) TestPipeliningFromGoroutines(c *C) { +func (t *RedisTest) TestPipelineEchoFromGoroutines(c *C) { pipeline, err := t.client.PipelineClient() c.Assert(err, IsNil) defer func() { diff --git a/request.go b/request.go index 4e78e747..76671f0e 100644 --- a/request.go +++ b/request.go @@ -8,7 +8,7 @@ import ( var Nil = errors.New("(nil)") -var errResultMissing = errors.New("Request was not run properly.") +var ErrValNotSet = errors.New("redis: value is not set") //------------------------------------------------------------------------------ @@ -139,7 +139,7 @@ func (r *BaseReq) Err() error { return r.err } if r.val == nil { - return errResultMissing + return ErrValNotSet } return nil }