Better tests

redeo_test.go

@@ -26,7 +26,7 @@ var _ = Describe("Ping", func() {
 
 		w = redeotest.NewRecorder()
 		subject.ServeRedeo(w, resp.NewCommand("PING", resp.CommandArgument("bad"), resp.CommandArgument("args")))
-		Expect(w.Response()).To(Equal("ERR wrong number of arguments for 'PING' command"))
+		Expect(w.Response()).To(MatchError("ERR wrong number of arguments for 'PING' command"))
 	})
 
 })
@@ -61,19 +61,19 @@ var _ = Describe("SubCommands", func() {
 	It("should fail on calls without a sub", func() {
 		w := redeotest.NewRecorder()
 		subject.ServeRedeo(w, resp.NewCommand("CUSTOM"))
-		Expect(w.Response()).To(Equal("ERR wrong number of arguments for 'CUSTOM' command"))
+		Expect(w.Response()).To(MatchError("ERR wrong number of arguments for 'CUSTOM' command"))
 	})
 
 	It("should fail on calls with an unknown sub", func() {
 		w := redeotest.NewRecorder()
 		subject.ServeRedeo(w, resp.NewCommand("CUSTOM", resp.CommandArgument("missing")))
-		Expect(w.Response()).To(Equal("ERR Unknown custom subcommand 'missing'"))
+		Expect(w.Response()).To(MatchError("ERR Unknown custom subcommand 'missing'"))
 	})
 
 	It("should fail on calls with invalid args", func() {
 		w := redeotest.NewRecorder()
 		subject.ServeRedeo(w, resp.NewCommand("CUSTOM", resp.CommandArgument("echo")))
-		Expect(w.Response()).To(Equal("ERR wrong number of arguments for 'CUSTOM echo' command"))
+		Expect(w.Response()).To(MatchError("ERR wrong number of arguments for 'CUSTOM echo' command"))
 	})
 
 	It("should succeed", func() {

redeotest/redeotest.go

@@ -9,6 +9,12 @@ import (
 	"github.com/bsm/redeo/resp"
 )
 
+// ErrorResponse is used to wrap error strings
+type ErrorResponse string
+
+// Error implements error interface
+func (e ErrorResponse) Error() string { return string(e) }
+
 // ResponseRecorder is an implementation of resp.ResponseWriter that
 // is helpful in tests.
 type ResponseRecorder struct {
@@ -44,10 +50,11 @@ func (r *ResponseRecorder) Quoted() string {
 
 // Response returns the first response
 func (r *ResponseRecorder) Response() (interface{}, error) {
-	_ = r.ResponseWriter.Flush()
-
-	rr := resp.NewResponseReader(bytes.NewReader(r.b.Bytes()))
-	return parseResult(rr)
+	vv, err := r.Responses()
+	if err != nil || len(vv) == 0 {
+		return nil, err
+	}
+	return vv[len(vv)-1], nil
 }
 
 // Responses returns all responses
@@ -81,7 +88,11 @@ func parseResult(rr resp.ResponseReader) (interface{}, error) {
 	case resp.TypeInt:
 		return rr.ReadInt()
 	case resp.TypeError:
-		return rr.ReadError()
+		s, err := rr.ReadError()
+		if err != nil {
+			return nil, err
+		}
+		return ErrorResponse(s), nil
 	case resp.TypeNil:
 		return nil, rr.ReadNil()
 	case resp.TypeArray: