X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ffailure.cc;h=016ea5e445e12b84ff12945a482d08049ad565c4;hb=ca663a567bc8d3facb22b035bcad19349e42a9b1;hp=699ef46cddd6b9385b1367ce274b38c6c125d487;hpb=a2d3699da26720a399bd7f563ccdbccf26e610c5;p=m6w6%2Flibmemcached

diff --git a/tests/failure.cc b/tests/failure.cc
index 699ef46c..016ea5e4 100644
--- a/tests/failure.cc
+++ b/tests/failure.cc
@@ -63,6 +63,8 @@ Framework *global_framework= NULL;
 
 static test_return_t shutdown_servers(memcached_st *memc)
 {
+  test_skip_valgrind();
+
   test_compare(memcached_server_count(memc), 1U);
 
   // Disable a single server, just the first
@@ -73,6 +75,8 @@ static test_return_t shutdown_servers(memcached_st *memc)
 
 static test_return_t add_shutdown_servers(memcached_st *memc)
 {
+  test_skip_valgrind();
+
   while (memcached_server_count(memc) < 2)
   {
     const char *argv[1]= { "add_shutdown_server" };
@@ -94,6 +98,7 @@ static test_return_t restart_servers(memcached_st *)
   return TEST_SUCCESS;
 }
 
+#include "libmemcached/instance.h"
 static test_return_t cull_TEST(memcached_st *memc)
 {
   uint32_t count= memcached_server_count(memc);
@@ -148,7 +153,7 @@ static test_return_t MEMCACHED_SERVER_TEMPORARILY_DISABLED_to_success_TEST(memca
 
   memcached_return_t ret;
   do {
-    sleep(3);
+    libtest::dream(3, 0);
     ret= memcached_set(memc, test_literal_param("foo"), NULL, 0, time_t(0), uint32_t(0));
   } while (ret == MEMCACHED_SERVER_TEMPORARILY_DISABLED);
 
@@ -171,7 +176,7 @@ static test_return_t MEMCACHED_SERVER_MARKED_DEAD_TEST(memcached_st *memc)
   test_compare(MEMCACHED_SERVER_TEMPORARILY_DISABLED, ret);
 
   do {
-    sleep(3);
+    libtest::dream(3, 0);
     ret= memcached_set(memc, test_literal_param("foo"), NULL, 0, time_t(0), uint32_t(0));
   } while (ret == MEMCACHED_SERVER_TEMPORARILY_DISABLED or ret == MEMCACHED_SUCCESS);
 
@@ -203,27 +208,18 @@ collection_st collection[] ={
   { 0, 0, 0, 0 }
 };
 
-#include "libmemcached_world.h"
+#include "tests/libmemcached_world.h"
 
 void get_world(Framework *world)
 {
-  world->servers().set_count(1);
-
-  world->collections= collection;
-
-  world->_create= (test_callback_create_fn*)world_create;
-  world->_destroy= (test_callback_destroy_fn*)world_destroy;
+  world->servers().set_servers_to_run(1);
 
-  world->item._startup= (test_callback_fn*)world_test_startup;
-  world->item.set_pre((test_callback_fn*)world_pre_run);
-  world->item.set_flush((test_callback_fn*)world_flush);
-  world->item.set_post((test_callback_fn*)world_post_run);
-  world->_on_error= (test_callback_error_fn*)world_on_error;
+  world->collections(collection);
 
-  world->collection_startup= (test_callback_fn*)world_container_startup;
-  world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
+  world->create((test_callback_create_fn*)world_create);
+  world->destroy((test_callback_destroy_fn*)world_destroy);
 
-  world->set_runner(&defualt_libmemcached_runner);
+  world->set_runner(new LibmemcachedRunner);
 
   global_framework= world;
 }