X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ffailure.cc;h=923cdf3878e63e3a44e85f493516f80ffde3e43f;hb=7253c10fe79f6a72b0aec419560823a16ad55a0a;hp=1348e50cd05a8c4365c8ff31c85589d0bcd47a84;hpb=a18c65b0ee1a4721a4f1298f52f8b3446cf7c600;p=m6w6%2Flibmemcached

diff --git a/tests/failure.cc b/tests/failure.cc
index 1348e50c..923cdf38 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,12 +75,13 @@ 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" };
-    in_port_t port= max_port() +1;
-    test_true(global_framework->servers().start_socket_server("memcached", port, 1, argv));
-    test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, "localhost", port));
+    test_true(global_framework->servers().start_socket_server("memcached", libtest::default_port(), 1, argv));
+    test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, "localhost", libtest::default_port()));
   }
 
   // Disable a single server, just the first
@@ -208,7 +211,7 @@ collection_st collection[] ={
 
 void get_world(Framework *world)
 {
-  world->servers().set_count(1);
+  world->servers().set_servers_to_run(1);
 
   world->collections= collection;
 
@@ -216,15 +219,12 @@ void get_world(Framework *world)
   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;
 }