X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached_world.h;h=2608778c9b13c497bccbc517833665c12ec0d842;hb=cefa03b14574d23cdd2f9db5ff28f210e697042c;hp=dfdddbefe00796336603fa2af813c8c9ef42eef8;hpb=9cd57ce737375540f6c3b5e2e3684160e5c4bfce;p=awesomized%2Flibmemcached diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h index dfdddbef..2608778c 100644 --- a/tests/libmemcached_world.h +++ b/tests/libmemcached_world.h @@ -1,150 +1,99 @@ -/* libMemcached Functions Test - * Copyright (C) 2006-2009 Brian Aker - * All rights reserved. +/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: + * + * Libmemcached Client and Server * - * Use and distribution licensed under the BSD license. See - * the COPYING file in the parent directory for full text. + * Copyright (C) 2012 Data Differential, http://datadifferential.com/ + * Copyright (C) 2006-2009 Brian Aker + * All rights reserved. * - * Description: This is the startup bits for any libmemcached test. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ + #pragma once -#include +#include "tests/libmemcached_test_container.h" -/* The structure we use for the test system */ -struct libmemcached_test_container_st +static void *world_create(libtest::server_startup_st& servers, test_return_t& error) { - server_startup_st construct; - memcached_st *parent; - memcached_st *memc; - - libmemcached_test_container_st() : - parent(NULL), - memc(NULL) - { } -}; + SKIP_UNLESS(libtest::has_libmemcached()); -#ifdef __cplusplus -extern "C" { -#endif - -/* Prototypes for functions we will pass to test framework */ -libmemcached_test_container_st *world_create(test_return_t *error); -test_return_t world_test_startup(libmemcached_test_container_st *); -test_return_t world_flush(libmemcached_test_container_st *container); -test_return_t world_pre_run(libmemcached_test_container_st *); - -test_return_t world_post_run(libmemcached_test_container_st *); -test_return_t world_on_error(test_return_t, libmemcached_test_container_st *); -test_return_t world_destroy(libmemcached_test_container_st *); - -/** - @note generic shutdown/startup for libmemcached tests. -*/ -test_return_t world_container_startup(libmemcached_test_container_st *container); -test_return_t world_container_shutdown(libmemcached_test_container_st *container); + if (servers.sasl()) + { + SKIP_UNLESS(libtest::has_libmemcached_sasl()); + + // Assume we are running under valgrind, and bail + if (getenv("LOG_COMPILER")) + { + error= TEST_SKIPPED; + return NULL; + } + } -libmemcached_test_container_st *world_create(test_return_t *error) -{ - libmemcached_test_container_st *global_container= new libmemcached_test_container_st(); - if (not server_startup(&global_container->construct)) + for (uint32_t x= 0; x < servers.servers_to_run(); x++) { - *error= TEST_FAILURE; - return NULL; + in_port_t port= libtest::get_free_port(); + + if (servers.sasl()) + { + if (server_startup(servers, "memcached-sasl", port, NULL) == false) + { + error= TEST_SKIPPED; + return NULL; + } + } + else + { + if (server_startup(servers, "memcached", port, NULL) == false) + { + error= TEST_SKIPPED; + return NULL; + } + } } - *error= TEST_SUCCESS; + libmemcached_test_container_st *global_container= new libmemcached_test_container_st(servers); return global_container; } -test_return_t world_container_startup(libmemcached_test_container_st *container) -{ - char buffer[BUFSIZ]; - - test_compare_got(MEMCACHED_SUCCESS, - libmemcached_check_configuration(container->construct.server_list.c_str(), container->construct.server_list.size(), - buffer, sizeof(buffer)), - buffer); - - assert(not container->parent); - container->parent= memcached(container->construct.server_list.c_str(), container->construct.server_list.size()); - test_true(container->parent); - - return TEST_SUCCESS; -} - -test_return_t world_container_shutdown(libmemcached_test_container_st *container) -{ - memcached_free(container->parent); - container->parent= NULL; - - return TEST_SUCCESS; -} - -test_return_t world_test_startup(libmemcached_test_container_st *container) +static bool world_destroy(void *object) { - assert(container); - assert(not container->memc); - assert(container->parent); - container->memc= memcached_clone(NULL, container->parent); - test_true(container->memc); - - return TEST_SUCCESS; -} - -test_return_t world_flush(libmemcached_test_container_st *container) -{ - assert(container->memc); - memcached_flush(container->memc, 0); - memcached_quit(container->memc); - - return TEST_SUCCESS; -} - -test_return_t world_pre_run(libmemcached_test_container_st *container) -{ - assert(container->memc); - for (uint32_t loop= 0; loop < memcached_server_list_count(container->memc->servers); loop++) + libmemcached_test_container_st *container= (libmemcached_test_container_st *)object; +#if 0 +#if defined(LIBMEMCACHED_WITH_SASL_SUPPORT) && LIBMEMCACHED_WITH_SASL_SUPPORT + if (LIBMEMCACHED_WITH_SASL_SUPPORT) { - memcached_server_instance_st instance= - memcached_server_instance_by_position(container->memc, loop); - - test_compare(-1, instance->fd); - test_compare(0, instance->cursor_active); + sasl_done(); } - - return TEST_SUCCESS; -} - - -test_return_t world_post_run(libmemcached_test_container_st *container) -{ - test_true(container->memc); - - return TEST_SUCCESS; -} - -test_return_t world_on_error(test_return_t test_state, libmemcached_test_container_st *container) -{ - (void)test_state; - assert(container->memc); - memcached_free(container->memc); - container->memc= NULL; - - return TEST_SUCCESS; -} - -test_return_t world_destroy(libmemcached_test_container_st *container) -{ - server_startup_st *construct= &container->construct; - - server_shutdown(construct); - -#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT - sasl_done(); +#endif #endif delete container; @@ -153,62 +102,5 @@ test_return_t world_destroy(libmemcached_test_container_st *container) } typedef test_return_t (*libmemcached_test_callback_fn)(memcached_st *); -static test_return_t _runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container) -{ - if (func) - { - assert(container); - assert(container->memc); - return func(container->memc); - } - else - { - return TEST_SUCCESS; - } -} -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 - -#ifdef __cplusplus - -static Runner defualt_libmemcached_runner= { - reinterpret_cast(_pre_runner_default), - reinterpret_cast(_runner_default), - reinterpret_cast(_post_runner_default) -}; - -#else - -static Runner defualt_libmemcached_runner= { - (test_callback_runner_fn)_pre_runner_default, - (test_callback_runner_fn)_runner_default, - (test_callback_runner_fn)_post_runner_default -}; - -#endif +#include "tests/runner.h"