Commit bc5dcdbc authored by Pieter Noordhuis's avatar Pieter Noordhuis
Browse files

Status replies should have type REDIS_REPLY_STATUS

parent 171b5a24
...@@ -118,10 +118,6 @@ static void *createStringObject(redisReadTask *task, char *str, size_t len) { ...@@ -118,10 +118,6 @@ static void *createStringObject(redisReadTask *task, char *str, size_t len) {
r->str = value; r->str = value;
r->len = len; r->len = len;
/* for API compat, set STATUS to STRING */
if (task->type == REDIS_REPLY_STATUS)
r->type = REDIS_REPLY_STRING;
if (task->parent) { if (task->parent) {
redisReply *parent = task->parent; redisReply *parent = task->parent;
assert(parent->type == REDIS_REPLY_ARRAY); assert(parent->type == REDIS_REPLY_ARRAY);
......
...@@ -44,7 +44,7 @@ static void test_blocking_connection() { ...@@ -44,7 +44,7 @@ static void test_blocking_connection() {
__connect(&c); /* reconnect */ __connect(&c); /* reconnect */
test("Is able to deliver commands: "); test("Is able to deliver commands: ");
reply = redisCommand(c,"PING"); reply = redisCommand(c,"PING");
test_cond(reply->type == REDIS_REPLY_STRING && test_cond(reply->type == REDIS_REPLY_STATUS &&
strcasecmp(reply->str,"pong") == 0) strcasecmp(reply->str,"pong") == 0)
freeReplyObject(reply); freeReplyObject(reply);
...@@ -65,7 +65,7 @@ static void test_blocking_connection() { ...@@ -65,7 +65,7 @@ static void test_blocking_connection() {
test("Is a able to send commands verbatim: "); test("Is a able to send commands verbatim: ");
reply = redisCommand(c,"SET foo bar"); reply = redisCommand(c,"SET foo bar");
test_cond (reply->type == REDIS_REPLY_STRING && test_cond (reply->type == REDIS_REPLY_STATUS &&
strcasecmp(reply->str,"ok") == 0) strcasecmp(reply->str,"ok") == 0)
freeReplyObject(reply); freeReplyObject(reply);
...@@ -122,7 +122,7 @@ static void test_blocking_connection() { ...@@ -122,7 +122,7 @@ static void test_blocking_connection() {
reply->element[0]->elements == 2 && reply->element[0]->elements == 2 &&
!memcmp(reply->element[0]->element[0]->str,"bar",3) && !memcmp(reply->element[0]->element[0]->str,"bar",3) &&
!memcmp(reply->element[0]->element[1]->str,"foo",3) && !memcmp(reply->element[0]->element[1]->str,"foo",3) &&
reply->element[1]->type == REDIS_REPLY_STRING && reply->element[1]->type == REDIS_REPLY_STATUS &&
strcasecmp(reply->element[1]->str,"pong") == 0); strcasecmp(reply->element[1]->str,"pong") == 0);
freeReplyObject(reply); freeReplyObject(reply);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment