Merge Trond

diff --git a/clients/memcapable.c b/clients/memcapable.c
index 9921f1f147fd26ce5460c2ed48aefb687dfa5f7a..08524c495647de4aa300624b40931445d9ab64b8 100644 (file)
--- a/clients/memcapable.c
+++ b/clients/memcapable.c
@@ -1173,9 +1173,9 @@ static enum test_return receive_error_response(void)
 {
   char buffer[80];
   execute(receive_line(buffer, sizeof(buffer)));
-  verify(strncmp(buffer, "ERROR\r\n", 7) == 0 ||
-         strncmp(buffer, "CLIENT_ERROR:", 13) == 0 ||
-         strncmp(buffer, "SERVER_ERROR:", 13) == 0);
+  verify(strncmp(buffer, "ERROR", 5) == 0 ||
+         strncmp(buffer, "CLIENT_ERROR", 12) == 0 ||
+         strncmp(buffer, "SERVER_ERROR", 12) == 0);
   return TEST_PASS;
 }