re
/
ledisdb
forked from mirror/ledisdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error messages to be redis compliant (#293)

This commit is contained in:
Glen De Cauwsemaecker 2017-04-17 22:38:01 -05:00 committed by siddontang
parent 80ea7b8bca
commit 5835ab9b2b
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/client_resp.go
View File

@ -228,7 +228,6 @@ func newWriterRESP(conn net.Conn, size int) *respWriter {
func (w *respWriter) writeError(err error) {
w.buff.Write(hack.Slice("-"))
if err != nil {
w.buff.WriteByte(' ')
w.buff.Write(hack.Slice(err.Error()))
}
w.buff.Write(Delims)

8
server/client_resp_test.go
View File

@ -14,8 +14,7 @@ func TestRespWriter(t *testing.T) {
}{
{
v: errors.New("Some error"),
//e: "-Some error\r\n", // as described at http://redis.io/topics/protocol
e: "- Some error\r\n", // actual
e: "-Some error\r\n", // as described at http://redis.io/topics/protocol
},
{
v: "Some status",
@ -43,8 +42,7 @@ func TestRespWriter(t *testing.T) {
},
{
v: []interface{}{[]interface{}{int64(1), int64(2), int64(3)}, []interface{}{"Foo", errors.New("Bar")}},
//e: "*2\r\n*3\r\n:1\r\n:2\r\n:3\r\n*2\r\n+Foo\r\n-Bar\r\n",
e: "*2\r\n*3\r\n:1\r\n:2\r\n:3\r\n*2\r\n+Foo\r\n- Bar\r\n",
e: "*2\r\n*3\r\n:1\r\n:2\r\n:3\r\n*2\r\n+Foo\r\n-Bar\r\n",
},
} {
w := new(respWriter)
@ -68,7 +66,7 @@ func TestRespWriter(t *testing.T) {
}
w.flush()
if b.String() != fixture.e {
t.Errorf("respWriter, actual: %v, expected: %v", []byte(b.String()), []byte(fixture.e))
t.Errorf("respWriter, actual: %q, expected: %q", b.String(), fixture.e)
}
}

3
server/cmd_script.go
View File

@ -3,6 +3,7 @@ package server
import (
"crypto/sha1"
"encoding/hex"
"errors"
"fmt"
"github.com/siddontang/go/hack"
@ -70,7 +71,7 @@ func evalGenericCommand(c *client, evalSha1 bool) (err error) {
if global.Type() == lua.LTNil {
if evalSha1 {
return fmt.Errorf("missing %s script", key)
return errors.New("NOSCRIPT no matching script, please use EVAL")
}
val, err := l.LoadString(hack.String(c.args[0]))

8
server/cmd_server_test.go
View File

@ -18,7 +18,7 @@ func TestAuth(t *testing.T) {
// Should error, invalid pass
_, err = c1.Do("AUTH", "password")
if err.Error() != " authentication failure" {
if err.Error() != "authentication failure" {
t.Fatal("Expected authentication error:", err)
}
@ -27,7 +27,7 @@ func TestAuth(t *testing.T) {
// Should fail doing a command as we've not authed
_, err = c2.Do("GET", "tmp_select_key")
if err.Error() != " not authenticated" {
if err.Error() != "not authenticated" {
t.Fatal("Expected authentication error:", err)
}
@ -45,13 +45,13 @@ func TestAuth(t *testing.T) {
// Log out by sending wrong pass
_, err = c2.Do("AUTH", "wrong password")
if err.Error() != " authentication failure" {
if err.Error() != "authentication failure" {
t.Fatal("Expected authentication error:", err)
}
// Should fail doing a command as we're logged out
_, err = c2.Do("GET", "tmp_select_key")
if err.Error() != " not authenticated" {
if err.Error() != "not authenticated" {
t.Fatal("Expected authentication error:", err)
}
}