jenkins-promote-staging-trunk-libmemcached-14

[m6w6/libmemcached] / tests / failure.cc

diff --git a/tests/failure.cc b/tests/failure.cc
index 699ef46cddd6b9385b1367ce274b38c6c125d487..cfee6cb7783da3142a950ff957a403841368ea0f 100644 (file)
--- 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" };
@@ -207,23 +211,14 @@ collection_st collection[] ={
 
 void get_world(Framework *world)
 {
-  world->servers().set_count(1);
+  world->servers().set_servers_to_run(1);
 
   world->collections= collection;
 
   world->_create= (test_callback_create_fn*)world_create;
   world->_destroy= (test_callback_destroy_fn*)world_destroy;
 
-  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->collection_startup= (test_callback_fn*)world_container_startup;
-  world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
-
-  world->set_runner(&defualt_libmemcached_runner);
+  world->set_runner(new LibmemcachedRunner);
 
   global_framework= world;
 }