Catch up with Gearman's libtest

[m6w6/libmemcached] / tests / memcapable.cc

diff --git a/tests/memcapable.cc b/tests/memcapable.cc
index 4984818841cb4ed95e4bf3918d967fe931d32e32..d0392d016afd69900c2c0ffaedc4c112c119a7b4 100644 (file)
--- a/tests/memcapable.cc
+++ b/tests/memcapable.cc
@@ -113,8 +113,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  const char *argv[1]= { "memcapable" };
-  if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
+  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
   {
     error= TEST_FAILURE;
   }
@@ -126,7 +125,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 void get_world(Framework *world)
 {
   executable= "./clients/memcapable";
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }