Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-170

[awesomized/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..f7d4b34c8d9cc979e79e8cdae88d883e5bcbcb3d 100644 (file)
--- a/tests/libmemcached-1.0/debug.cc
+++ b/tests/libmemcached-1.0/debug.cc
@@ -35,17 +35,19 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
 #include <climits>
 
 using namespace libtest;
 
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 #include <tests/debug.h>
 #include <tests/print.h>
 
+#include "libmemcached/instance.hpp"
+
 /* Dump each server's keys */
 static memcached_return_t print_keys_callback(const memcached_st *,
                                               const char *key,
@@ -65,7 +67,7 @@ static memcached_return_t server_wrapper_for_dump_callback(const memcached_st *,
 {
   memcached_st *memc= memcached_create(NULL);
 
-  if (server->type == MEMCACHED_CONNECTION_UNIX_SOCKET)
+  if (strcmp(memcached_server_type(server), "SOCKET") == 0)
   {
     if (memcached_failed(memcached_server_add_unix_socket(memc, memcached_server_name(server))))
     {
@@ -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);