projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix test system to error correctly on interrupt/shutdown servers.
[m6w6/libmemcached]
/
tests
/
libmemcached_world.h
diff --git
a/tests/libmemcached_world.h
b/tests/libmemcached_world.h
index 36136c6e11f88e9fa5210fe184e9bc91500ea5f0..a6de23a0f520bc1252d11c14003dcbdedcc0f194 100644
(file)
--- a/
tests/libmemcached_world.h
+++ b/
tests/libmemcached_world.h
@@
-9,9
+9,9
@@
*
*/
*
*/
-#
ifdef __cplusplus
-extern "C" {
-#
endif
+#
pragma once
+
+#
include <cassert>
/* The structure we use for the test system */
struct libmemcached_test_container_st
/* The structure we use for the test system */
struct libmemcached_test_container_st
@@
-23,11
+23,13
@@
struct libmemcached_test_container_st
libmemcached_test_container_st() :
parent(NULL),
memc(NULL)
libmemcached_test_container_st() :
parent(NULL),
memc(NULL)
- {
- memset(&construct, 0, sizeof(server_startup_st));
- }
+ { }
};
};
+#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 *);
/* 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 *);
@@
-50,12
+52,9
@@
libmemcached_test_container_st *world_create(test_return_t *error)
{
global_container.construct.count= SERVERS_TO_CREATE;
global_container.construct.udp= 0;
{
global_container.construct.count= SERVERS_TO_CREATE;
global_container.construct.udp= 0;
- server_startup(&global_container.construct);
-
- if (not global_container.construct.servers)
+ if (not server_startup(&global_container.construct))
{
*error= TEST_FAILURE;
{
*error= TEST_FAILURE;
- server_shutdown(&global_container.construct);
return NULL;
}
return NULL;
}
@@
-66,11
+65,16
@@
libmemcached_test_container_st *world_create(test_return_t *error)
test_return_t world_container_startup(libmemcached_test_container_st *container)
{
test_return_t world_container_startup(libmemcached_test_container_st *container)
{
- container->parent= memcached_create(NULL);
- test_true((container->parent != NULL));
+ 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);
- test_compare(MEMCACHED_SUCCESS,
- memcached_server_push(container->parent, container->construct.servers));
+ 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;
}
return TEST_SUCCESS;
}
@@
-85,14
+89,18
@@
test_return_t world_container_shutdown(libmemcached_test_container_st *container
test_return_t world_test_startup(libmemcached_test_container_st *container)
{
test_return_t world_test_startup(libmemcached_test_container_st *container)
{
+ assert(container);
+ assert(not container->memc);
+ assert(container->parent);
container->memc= memcached_clone(NULL, container->parent);
container->memc= memcached_clone(NULL, container->parent);
- test_true(
(container->memc != NULL)
);
+ test_true(
container->memc
);
return TEST_SUCCESS;
}
test_return_t world_flush(libmemcached_test_container_st *container)
{
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);
memcached_flush(container->memc, 0);
memcached_quit(container->memc);
@@
-101,6
+109,7
@@
test_return_t world_flush(libmemcached_test_container_st *container)
test_return_t world_pre_run(libmemcached_test_container_st *container)
{
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++)
{
memcached_server_instance_st instance=
for (uint32_t loop= 0; loop < memcached_server_list_count(container->memc->servers); loop++)
{
memcached_server_instance_st instance=
@@
-124,6
+133,7
@@
test_return_t world_post_run(libmemcached_test_container_st *container)
test_return_t world_on_error(test_return_t test_state, libmemcached_test_container_st *container)
{
(void)test_state;
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;
memcached_free(container->memc);
container->memc= NULL;
@@
-133,8
+143,6
@@
test_return_t world_on_error(test_return_t test_state, libmemcached_test_contain
test_return_t world_destroy(libmemcached_test_container_st *container)
{
server_startup_st *construct= &container->construct;
test_return_t world_destroy(libmemcached_test_container_st *container)
{
server_startup_st *construct= &container->construct;
- memcached_server_st *servers= container->construct.servers;
- memcached_server_list_free(servers);
server_shutdown(construct);
server_shutdown(construct);
@@
-150,6
+158,8
@@
static test_return_t _runner_default(libmemcached_test_callback_fn func, libmemc
{
if (func)
{
{
if (func)
{
+ assert(container);
+ assert(container->memc);
return func(container->memc);
}
else
return func(container->memc);
}
else
@@
-188,7
+198,7
@@
static test_return_t _post_runner_default(libmemcached_test_callback_fn func, li
#ifdef __cplusplus
#ifdef __cplusplus
-static
world_runner_st
defualt_libmemcached_runner= {
+static
Runner
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*>(_post_runner_default)
reinterpret_cast<test_callback_runner_fn*>(_pre_runner_default),
reinterpret_cast<test_callback_runner_fn*>(_runner_default),
reinterpret_cast<test_callback_runner_fn*>(_post_runner_default)
@@
-196,7
+206,7
@@
static world_runner_st defualt_libmemcached_runner= {
#else
#else
-static
world_runner_st
defualt_libmemcached_runner= {
+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
(test_callback_runner_fn)_pre_runner_default,
(test_callback_runner_fn)_runner_default,
(test_callback_runner_fn)_post_runner_default