Import/Merge of libtest latest.

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

diff --git a/tests/libmemcached-1.0/debug.cc b/tests/libmemcached-1.0/debug.cc
index 5e72a0b6b52bf5c0496fa9797906f4d1d3653ecf..603e15ca4bc7ec3ed8c7a6d32473dea00d252fbb 100644 (file)
--- a/tests/libmemcached-1.0/debug.cc
+++ b/tests/libmemcached-1.0/debug.cc
@@ -46,6 +46,8 @@ using namespace libtest;
 #include <tests/debug.h>
 #include <tests/print.h>
 
+#include "libmemcached/instance.h"
+
 /* Dump each server's keys */
 static memcached_return_t print_keys_callback(const memcached_st *,
                                               const char *key,
@@ -109,7 +111,7 @@ test_return_t confirm_keys_exist(memcached_st *memc, const char * const *keys, c
                                0, &rc);
     if (require_all)
     {
-      test_true_got(value, keys[x]);
+      test_true(value);
       if (key_matches_value)
       {
         test_strcmp(keys[x], value);
@@ -117,7 +119,7 @@ test_return_t confirm_keys_exist(memcached_st *memc, const char * const *keys, c
     }
     else if (memcached_success(rc))
     {
-      test_warn_hint(value, keys[x]);
+      test_warn(value, "get() did not return a value");
       if (value and key_matches_value)
       {
         test_strcmp(keys[x], value);