Fix for SASL

[awesomized/libmemcached] / tests / libmemcached_world.h

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 4652b2460d9ee908a62c00d7b40bd25286935f24..5a5e15b5c4fb5ff622e08e96d08357025be29fab 100644 (file)
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -96,10 +96,10 @@ test_return_t world_flush(libmemcached_test_container_st *container)
 
 test_return_t world_pre_run(libmemcached_test_container_st *container)
 {
-  for (uint32_t loop= 0; loop < memcached_server_list_count(container->construct.servers); loop++)
+  for (uint32_t loop= 0; loop < memcached_server_list_count(container->memc->servers); loop++)
   {
-    memcached_server_st *instance=
-      memcached_server_instance_fetch(container->memc, loop);
+    memcached_server_instance_st instance=
+      memcached_server_instance_by_position(container->memc, loop);
 
     test_true(instance->fd == -1);
     test_true(instance->cursor_active == 0);
@@ -149,6 +149,30 @@ static test_return_t _runner_default(libmemcached_test_callback_fn func, libmemc
   }
 }
 
+static test_return_t _pre_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
+{
+  if (func)
+  {
+    return func(container->parent);
+  }
+  else
+  {
+    return TEST_SUCCESS;
+  }
+}
+
+static test_return_t _post_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
+{
+  if (func)
+  {
+    return func(container->parent);
+  }
+  else
+  {
+    return TEST_SUCCESS;
+  }
+}
+
 #ifdef __cplusplus
 }
 #endif
@@ -156,17 +180,17 @@ static test_return_t _runner_default(libmemcached_test_callback_fn func, libmemc
 #ifdef __cplusplus
 
 static world_runner_st defualt_libmemcached_runner= {
+  reinterpret_cast<test_callback_runner_fn>(_pre_runner_default),
   reinterpret_cast<test_callback_runner_fn>(_runner_default),
-  reinterpret_cast<test_callback_runner_fn>(_runner_default),
-  reinterpret_cast<test_callback_runner_fn>(_runner_default)
+  reinterpret_cast<test_callback_runner_fn>(_post_runner_default)
 };
 
 #else
 
 static world_runner_st defualt_libmemcached_runner= {
+  (test_callback_runner_fn)_pre_runner_default,
   (test_callback_runner_fn)_runner_default,
-  (test_callback_runner_fn)_runner_default,
-  (test_callback_runner_fn)_runner_default
+  (test_callback_runner_fn)_post_runner_default
 };
 
 #endif