Merge in build trunk

[m6w6/libmemcached] / tests / libmemcached_world.h

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 968c235e6f027cc089061307682469c1b91d8b08..824aabe751adfa503384f780d83233d404f81db1 100644 (file)
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -27,13 +27,29 @@ struct libmemcached_test_container_st
   { }
 };
 
-#define SERVERS_TO_CREATE 5
-#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
-
 static void *world_create(server_startup_st& servers, test_return_t& error)
 {
-  in_port_t max_port;
-  for (uint32_t x= 0; x < SERVERS_TO_CREATE; x++)
+  if (HAVE_MEMCACHED_BINARY == 0)
+  {
+    error= TEST_SKIPPED;
+    return NULL;
+  }
+
+  if (servers.sasl() and (LIBMEMCACHED_WITH_SASL_SUPPORT == 0 or MEMCACHED_SASL_BINARY == 0))
+  {
+    error= TEST_SKIPPED;
+    return NULL;
+  }
+
+  // Assume we are running under valgrind, and bail
+  if (servers.sasl() and getenv("TESTS_ENVIRONMENT"))
+  {
+    error= TEST_SKIPPED;
+    return NULL;
+  }
+
+  in_port_t max_port= TEST_PORT_BASE;
+  for (uint32_t x= 0; x < servers.count(); x++)
   {
     in_port_t port;
 
@@ -52,20 +68,43 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 
     max_port= port;
     const char *argv[1]= { "memcached" };
-    if (not server_startup(servers, "memcached", port, 1, argv))
+    if (servers.sasl())
     {
-      error= TEST_FAILURE;
-      return NULL;
+      if (not server_startup(servers, "memcached-sasl", port, 1, argv))
+      {
+        error= TEST_FATAL;
+        return NULL;
+      }
+    }
+    else
+    {
+      if (not server_startup(servers, "memcached", port, 1, argv))
+      {
+        error= TEST_FATAL;
+        return NULL;
+      }
     }
   }
 
   if (servers.socket())
   {
-    const char *argv[1]= { "memcached" };
-    if (not servers.start_socket_server("memcached", max_port +1, 1, argv))
+    if (servers.sasl())
     {
-      error= TEST_FAILURE;
-      return NULL;
+      const char *argv[1]= { "memcached" };
+      if (not servers.start_socket_server("memcached-sasl", max_port +1, 1, argv))
+      {
+        error= TEST_FATAL;
+        return NULL;
+      }
+    }
+    else
+    {
+      const char *argv[1]= { "memcached" };
+      if (not servers.start_socket_server("memcached", max_port +1, 1, argv))
+      {
+        error= TEST_FATAL;
+        return NULL;
+      }
     }
   }
 
@@ -91,9 +130,25 @@ static test_return_t world_container_startup(libmemcached_test_container_st *con
                                                     buffer, sizeof(buffer)),
                    container->construct.option_string().c_str());
 
-  test_true(not container->parent);
+  test_null(container->parent);
   container->parent= memcached(container->construct.option_string().c_str(), container->construct.option_string().size());
   test_true(container->parent);
+  test_compare(MEMCACHED_SUCCESS, memcached_version(container->parent));
+
+  if (container->construct.sasl())
+  {
+    if (memcached_failed(memcached_behavior_set(container->parent, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1)))
+    {
+      memcached_free(container->parent);
+      return TEST_FAILURE;
+    }
+
+    if (memcached_failed(memcached_set_sasl_auth_data(container->parent, container->construct.username().c_str(), container->construct.password().c_str())))
+    {
+      memcached_free(container->parent);
+      return TEST_FAILURE;
+    }
+  }
 
   for (uint32_t host= 0; host < memcached_server_count(container->parent); ++host)
   {
@@ -120,7 +175,7 @@ static test_return_t world_container_shutdown(libmemcached_test_container_st *co
 static test_return_t world_test_startup(libmemcached_test_container_st *container)
 {
   test_true(container);
-  test_true(not container->memc);
+  test_null(container->memc);
   test_true(container->parent);
   container->memc= memcached_clone(NULL, container->parent);
   test_true(container->memc);
@@ -161,9 +216,8 @@ static test_return_t world_post_run(libmemcached_test_container_st *container)
   return TEST_SUCCESS;
 }
 
-static test_return_t world_on_error(test_return_t test_state, libmemcached_test_container_st *container)
+static test_return_t world_on_error(test_return_t , libmemcached_test_container_st *container)
 {
-  (void)test_state;
   test_true(container->memc);
   memcached_free(container->memc);
   container->memc= NULL;
@@ -174,8 +228,11 @@ static test_return_t world_on_error(test_return_t test_state, libmemcached_test_
 static bool world_destroy(void *object)
 {
   libmemcached_test_container_st *container= (libmemcached_test_container_st *)object;
-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
-  sasl_done();
+#if defined(LIBMEMCACHED_WITH_SASL_SUPPORT) && LIBMEMCACHED_WITH_SASL_SUPPORT
+  if (LIBMEMCACHED_WITH_SASL_SUPPORT)
+  {
+    sasl_done();
+  }
 #endif
 
   delete container;
@@ -191,7 +248,17 @@ static test_return_t _runner_default(libmemcached_test_callback_fn func, libmemc
   {
     test_true(container);
     test_true(container->memc);
-    return func(container->memc);
+    test_return_t ret;
+    try {
+      ret= func(container->memc);
+    }
+    catch (std::exception& e)
+    {
+      Error << e.what();
+      return TEST_FAILURE;
+    }
+
+    return ret;
   }
 
   return TEST_SUCCESS;