Remove final flush logic

[m6w6/libmemcached] / tests / libmemcached_world.h

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 5fab96fe2a9e71f00db4d24061fb6f5f008433d6..2d05a5d596e78d6a40ddabd874666c3d79843c7e 100644 (file)
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -150,38 +150,6 @@ static test_return_t world_test_startup(libmemcached_test_container_st *containe
   return TEST_SUCCESS;
 }
 
-test_return_t world_flush(libmemcached_test_container_st *container);
-test_return_t world_flush(libmemcached_test_container_st *container)
-{
-  test_true(container->memc);
-  memcached_flush(container->memc, 0);
-  memcached_quit(container->memc);
-
-  return TEST_SUCCESS;
-}
-
-static test_return_t world_pre_run(libmemcached_test_container_st *container)
-{
-  test_true(container->memc);
-  for (uint32_t loop= 0; loop < memcached_server_list_count(container->memc->servers); loop++)
-  {
-    memcached_server_instance_st instance= memcached_server_instance_by_position(container->memc, loop);
-
-    test_compare(-1, instance->fd);
-    test_compare(0U, instance->cursor_active);
-  }
-
-  return TEST_SUCCESS;
-}
-
-
-static test_return_t world_post_run(libmemcached_test_container_st *container)
-{
-  test_true(container->memc);
-
-  return TEST_SUCCESS;
-}
-
 static test_return_t world_on_error(test_return_t , libmemcached_test_container_st *container)
 {
   test_true(container->memc);
@@ -208,67 +176,4 @@ static bool world_destroy(void *object)
 
 typedef test_return_t (*libmemcached_test_callback_fn)(memcached_st *);
 
-class LibmemcachedRunner : public libtest::Runner {
-public:
-  test_return_t run(test_callback_fn* func, void *object)
-  {
-    return _runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
-  }
-
-  test_return_t pre(test_callback_fn* func, void *object)
-  {
-    return _pre_runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
-  }
-
-  test_return_t post(test_callback_fn* func, void *object)
-  {
-    return _post_runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
-  }
-
-private:
-  test_return_t _runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
-  {
-    test_compare(true, check());
-
-    if (func)
-    {
-      test_true(container);
-      test_true(container->memc);
-      test_return_t ret;
-      try {
-        ret= func(container->memc);
-      }
-      catch (std::exception& e)
-      {
-        libtest::Error << e.what();
-        return TEST_FAILURE;
-      }
-
-      return ret;
-    }
-
-    return TEST_SUCCESS;
-  }
-
-  test_return_t _pre_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
-  {
-    if (func)
-    {
-      return func(container->parent);
-    }
-
-    return TEST_SUCCESS;
-  }
-
-  test_return_t _post_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
-  {
-    if (func)
-    {
-      return func(container->parent);
-    }
-
-    return TEST_SUCCESS;
-  }
-};
-
-static LibmemcachedRunner defualt_libmemcached_runner;
+#include "tests/runner.h"