Simplify down the benchmark caller.

[m6w6/libmemcached] / tests / libmemcached_world_socket.h

diff --git a/tests/libmemcached_world_socket.h b/tests/libmemcached_world_socket.h
index b034ca6181b0d99966acc9c82d88dc3c2ecb09de..b1748cab4cb2249653e5cb31eaef12056e64fcab 100644 (file)
--- a/tests/libmemcached_world_socket.h
+++ b/tests/libmemcached_world_socket.h
@@ -63,24 +63,17 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
     return NULL;
   }
 
-  in_port_t max_port= TEST_PORT_BASE;
-  for (uint32_t x= 0; x < servers.count(); x++)
+  for (uint32_t x= 0; x < servers.servers_to_run(); x++)
   {
     const char *argv[1]= { "memcached" };
-    if (not servers.start_socket_server("memcached", max_port +1, 1, argv))
+    if (servers.start_socket_server("memcached", libtest::get_free_port(), 1, argv) == false)
     {
-      error= TEST_FATAL;
-      return NULL;
+      fatal_message("Could not launch memcached");
     }
   }
 
 
   libmemcached_test_container_st *global_container= new libmemcached_test_container_st(servers);
-  if (global_container == NULL)
-  {
-    error= TEST_MEMORY_ALLOCATION_FAILURE;
-    return NULL;
-  }
 
   error= TEST_SUCCESS;
 
@@ -116,17 +109,6 @@ static test_return_t world_container_startup(libmemcached_test_container_st *con
     }
   }
 
-  for (uint32_t host= 0; host < memcached_server_count(container->parent); ++host)
-  {
-    memcached_server_instance_st instance=
-      memcached_server_instance_by_position(container->parent, host);
-
-    if (instance->type == MEMCACHED_CONNECTION_TCP)
-    {
-      test_true_got(memcached_server_port(instance) >= TEST_PORT_BASE, memcached_server_port(instance));
-    }
-  }
-
   return TEST_SUCCESS;
 }