X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fdump.cc;h=9740d6983172c643f92aa07d5743c54780ea8187;hb=refs%2Fpull%2F92%2Fhead;hp=a265434cd997aef8966ec77ea5370dd888cd6cdc;hpb=a2001821c1712917ee84c68ac28f050a3095dddc;p=awesomized%2Flibmemcached

diff --git a/tests/libmemcached-1.0/dump.cc b/tests/libmemcached-1.0/dump.cc
index a265434c..9740d698 100644
--- a/tests/libmemcached-1.0/dump.cc
+++ b/tests/libmemcached-1.0/dump.cc
@@ -34,30 +34,33 @@
  *
  */
 
-#include <mem_config.h>
+#include "mem_config.h"
 
 #include <cstdlib>
 #include <climits>
 
-#include <libtest/test.hpp>
+#include "libtest/test.hpp"
 
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
+#include "libmemcached-1.0/memcached.h"
+#include "libmemcachedutil-1.0/util.h"
 
 using namespace libtest;
 
 #include "tests/libmemcached-1.0/dump.h"
 
 static memcached_return_t callback_dump_counter(const memcached_st *,
-                                                const char*, // key,
-                                                size_t, // length,
+                                                const char* key,
+                                                size_t length,
                                                 void *context)
 {
   size_t *counter= (size_t *)context;
 
 #if 0
   std::cerr.write(key, length);
-  std::cerr << std::endl;
+  std::cerr << ": " << *counter << std::endl;
+#else
+  (void)key;
+  (void)length;
 #endif
 
   *counter= *counter +1;
@@ -78,6 +81,9 @@ static memcached_return_t item_counter(const memcached_instance_st * ,
     {
       return MEMCACHED_FAILURE;
     }
+#if 0
+    std::cerr << "# " << number_value << " items " << std::endl;
+#endif
     *counter= *counter +number_value;
   }
 
@@ -110,21 +116,23 @@ test_return_t memcached_dump_TEST2(memcached_st *memc)
 {
   test_skip(false, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL));
 
-  /* The dump test relies on there being at least 32 items in memcached */
   for (uint32_t x= 0; x < memcached_dump_TEST2_COUNT; x++)
   {
     char key[1024];
 
-    int length= snprintf(key, sizeof(key), "%s%u", __func__, x);
+    int length= snprintf(key, sizeof(key), "%s_%u", __func__, x);
 
     test_true(length > 0);
 
     test_compare(MEMCACHED_SUCCESS,
                  memcached_set(memc, key, length,
-                               NULL, 0, // Zero length values
+                               key, length,
                                time_t(0), uint32_t(0)));
   }
-  //memcached_quit(memc);
+  memcached_quit(memc);
+
+  // give memcached some time
+  libtest::dream(1, 0);
 
   uint64_t counter= 0;
   test_compare(MEMCACHED_SUCCESS,