48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
|
From bf236d8b2a533d2a1380ad51140f61ae9a730971 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Wallner <mike@php.net>
|
||
|
|
Date: Mon, 14 Sep 2020 11:05:06 +0200
|
||
|
|
Subject: [PATCH] memcapable: fix quit test with v1.6+
|
||
|
|
|
||
|
|
---
|
||
|
|
clients/memcapable.cc | 18 ++++++++++--------
|
||
|
|
1 file changed, 10 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/clients/memcapable.cc b/clients/memcapable.cc
|
||
|
|
index 6ae0aeea..65ae027f 100644
|
||
|
|
--- a/clients/memcapable.cc
|
||
|
|
+++ b/clients/memcapable.cc
|
||
|
|
@@ -1262,14 +1262,16 @@ static enum test_return receive_error_response(void)
|
||
|
|
|
||
|
|
static enum test_return test_ascii_quit(void)
|
||
|
|
{
|
||
|
|
- /* Verify that quit handles unknown options */
|
||
|
|
- execute(send_string("quit foo bar\r\n"));
|
||
|
|
- execute(receive_error_response());
|
||
|
|
-
|
||
|
|
- /* quit doesn't support noreply */
|
||
|
|
- execute(send_string("quit noreply\r\n"));
|
||
|
|
- execute(receive_error_response());
|
||
|
|
+ if (!v16x_or_greater) {
|
||
|
|
+ /* Verify that quit handles unknown options */
|
||
|
|
+ execute(send_string("quit foo bar\r\n"));
|
||
|
|
+ execute(receive_error_response());
|
||
|
|
|
||
|
|
+ /* quit doesn't support noreply */
|
||
|
|
+ execute(send_string("quit noreply\r\n"));
|
||
|
|
+ execute(receive_error_response());
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/* Verify that quit works */
|
||
|
|
execute(send_string("quit\r\n"));
|
||
|
|
|
||
|
|
@@ -2024,8 +2026,8 @@ struct testcase
|
||
|
|
};
|
||
|
|
|
||
|
|
struct testcase testcases[]= {
|
||
|
|
- { "ascii quit", test_ascii_quit },
|
||
|
|
{ "ascii version", test_ascii_version },
|
||
|
|
+ { "ascii quit", test_ascii_quit },
|
||
|
|
{ "ascii verbosity", test_ascii_verbosity },
|
||
|
|
{ "ascii set", test_ascii_set },
|
||
|
|
{ "ascii set noreply", test_ascii_set_noreply },
|