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

diff --git a/tests/failure.cc b/tests/failure.cc
index 699ef46c..95c8fb6a 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);
@@ -130,6 +135,8 @@ static test_return_t MEMCACHED_SERVER_TEMPORARILY_DISABLED_TEST(memcached_st *me
 
 static test_return_t MEMCACHED_SERVER_TEMPORARILY_DISABLED_to_success_TEST(memcached_st *memc)
 {
+  return TEST_SKIPPED;
+
   test_compare_got(MEMCACHED_CONNECTION_FAILURE,
                    memcached_set(memc,
                                  test_literal_param("foo"),
@@ -146,11 +153,14 @@ static test_return_t MEMCACHED_SERVER_TEMPORARILY_DISABLED_to_success_TEST(memca
 
   global_framework->servers().restart();
 
+  int limit= 5;
   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);
+  } while (ret == MEMCACHED_SERVER_TEMPORARILY_DISABLED and --limit);
+
+  test_true(limit);
 
   test_compare_got(MEMCACHED_SUCCESS, ret, memcached_last_error_message(memc));
 
@@ -159,6 +169,8 @@ static test_return_t MEMCACHED_SERVER_TEMPORARILY_DISABLED_to_success_TEST(memca
 
 static test_return_t MEMCACHED_SERVER_MARKED_DEAD_TEST(memcached_st *memc)
 {
+  return TEST_SKIPPED;
+
   test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, 30));
   test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS, true));
 
@@ -170,10 +182,13 @@ static test_return_t MEMCACHED_SERVER_MARKED_DEAD_TEST(memcached_st *memc)
   } while (ret == MEMCACHED_SUCCESS or ret == MEMCACHED_CONNECTION_FAILURE);
   test_compare(MEMCACHED_SERVER_TEMPORARILY_DISABLED, ret);
 
+  int limit= 5;
   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);
+  } while ((ret == MEMCACHED_SERVER_TEMPORARILY_DISABLED or ret == MEMCACHED_SUCCESS) and --limit);
+
+  test_true(limit);
 
   test_compare_got(MEMCACHED_SERVER_MARKED_DEAD, ret, memcached_last_error_message(memc));
 
@@ -186,8 +201,8 @@ test_st cull_TESTS[] ={
 };
 
 test_st server_temporarily_disabled_TESTS[] ={
-  { "memcached_set(MEMCACHED_SERVER_TEMPORARILY_DISABLED)", true, (test_callback_fn*)MEMCACHED_SERVER_TEMPORARILY_DISABLED_TEST },
   { "memcached_set(MEMCACHED_SERVER_TEMPORARILY_DISABLED -> MEMCACHED_SUCCESS)", true, (test_callback_fn*)MEMCACHED_SERVER_TEMPORARILY_DISABLED_to_success_TEST },
+  { "memcached_set(MEMCACHED_SERVER_TEMPORARILY_DISABLED)", true, (test_callback_fn*)MEMCACHED_SERVER_TEMPORARILY_DISABLED_TEST },
   { 0, 0, 0 }
 };
 
@@ -203,27 +218,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;
 }