Update test

[m6w6/libmemcached] / tests / libmemcached-1.0 / mem_functions.cc

diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc
index 5dbf8ed2524846be2ce5f38c49ac10da2e77dd56..3fcba9958fa3b0fc42c69f6671cad28310993977 100644 (file)
--- a/tests/libmemcached-1.0/mem_functions.cc
+++ b/tests/libmemcached-1.0/mem_functions.cc
@@ -1188,23 +1188,20 @@ test_return_t read_through(memcached_st *memc)
 
 test_return_t get_test(memcached_st *memc)
 {
-  memcached_return_t rc;
-  char *string;
-  size_t string_length;
-  uint32_t flags;
-
   uint64_t query_id= memcached_query_id(memc);
-  rc= memcached_delete(memc,
-                       test_literal_param(__func__),
-                       time_t(0));
-  test_true_got(rc == MEMCACHED_BUFFERED or rc == MEMCACHED_NOTFOUND, memcached_last_error_message(memc));
+  memcached_return_t rc= memcached_delete(memc,
+                                          test_literal_param(__func__),
+                                          time_t(0));
+  test_true_hint(rc == MEMCACHED_BUFFERED or rc == MEMCACHED_NOTFOUND, memcached_last_error_message(memc));
   test_compare(query_id +1, memcached_query_id(memc));
 
-  string= memcached_get(memc,
+  size_t string_length;
+  uint32_t flags;
+  char *string= memcached_get(memc,
                         test_literal_param(__func__),
                         &string_length, &flags, &rc);
 
-  test_compare_got(MEMCACHED_NOTFOUND, rc, memcached_strerror(NULL, rc));
+  test_compare_got(MEMCACHED_NOTFOUND, rc, memcached_last_error_message(memc));
   test_false(string_length);
   test_false(string);
 
@@ -4205,7 +4202,9 @@ test_return_t regression_bug_442914(memcached_st *original_memc)
     char key[250];
     size_t len= (size_t)snprintf(key, sizeof(key), "%0250u", x);
     memcached_return_t rc= memcached_delete(memc, key, len, 0);
-    test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_last_error_message(memc));
+    char error_buffer[2048]= { 0 };
+    snprintf(error_buffer, sizeof(error_buffer), "%s key: %s", memcached_last_error_message(memc), key);
+    test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, error_buffer);
   }
 
   // Delete, and then delete again to look for not found
@@ -4213,7 +4212,7 @@ test_return_t regression_bug_442914(memcached_st *original_memc)
     char key[250];
     size_t len= snprintf(key, sizeof(key), "%037u", 251U);
     memcached_return_t rc= memcached_delete(memc, key, len, 0);
-    test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED);
+    test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED);
 
     test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, false));
     test_compare(MEMCACHED_NOTFOUND, memcached_delete(memc, key, len, 0));