X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ffailure.cc;h=4d81ecd4a9c94724f50814d01302991dfe3015b4;hb=9069819ac2940397e96210867e0666b801b97f60;hp=1348e50cd05a8c4365c8ff31c85589d0bcd47a84;hpb=da8731f513af0fcd2011e244a065f164241bced3;p=m6w6%2Flibmemcached

diff --git a/tests/failure.cc b/tests/failure.cc
index 1348e50c..4d81ecd4 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;
 
@@ -224,7 +227,7 @@ void get_world(Framework *world)
   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;
 }