projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Add support for query_id, and fixes a few cases where programmer error can
[awesomized/libmemcached]
/
tests
/
mem_functions.c
diff --git
a/tests/mem_functions.c
b/tests/mem_functions.c
index 96d0ac20c8d9f41324bbac9af4d18786ed1e1b61..95c33cbcf75f7437e1d360c2e6c339d026d65fe8 100644
(file)
--- a/
tests/mem_functions.c
+++ b/
tests/mem_functions.c
@@
-231,7
+231,12
@@
static memcached_return_t server_display_unsort_function(const memcached_st *ptr
uint32_t x= *((uint32_t *)(context));
(void)ptr;
uint32_t x= *((uint32_t *)(context));
(void)ptr;
- assert(test_ports[x] == server->port);
+ if (! (test_ports[x] == server->port))
+ {
+ fprintf(stderr, "%lu -> %lu\n", (unsigned long)test_ports[x], (unsigned long)server->port);
+ return MEMCACHED_FAILURE;
+ }
+
*((uint32_t *)(context))= ++x;
return MEMCACHED_SUCCESS;
*((uint32_t *)(context))= ++x;
return MEMCACHED_SUCCESS;
@@
-314,8
+319,6
@@
static test_return_t clone_test(memcached_st *memc)
{ // Test all of the flags
test_true(memc_clone->flags.no_block == memc->flags.no_block);
test_true(memc_clone->flags.tcp_nodelay == memc->flags.tcp_nodelay);
{ // Test all of the flags
test_true(memc_clone->flags.no_block == memc->flags.no_block);
test_true(memc_clone->flags.tcp_nodelay == memc->flags.tcp_nodelay);
- test_true(memc_clone->flags.reuse_memory == memc->flags.reuse_memory);
- test_true(memc_clone->flags.use_cache_lookups == memc->flags.use_cache_lookups);
test_true(memc_clone->flags.support_cas == memc->flags.support_cas);
test_true(memc_clone->flags.buffer_requests == memc->flags.buffer_requests);
test_true(memc_clone->flags.use_sort_hosts == memc->flags.use_sort_hosts);
test_true(memc_clone->flags.support_cas == memc->flags.support_cas);
test_true(memc_clone->flags.buffer_requests == memc->flags.buffer_requests);
test_true(memc_clone->flags.use_sort_hosts == memc->flags.use_sort_hosts);
@@
-5471,7
+5474,7
@@
static test_return_t test_cull_servers(memcached_st *memc)
uint32_t count = memcached_server_count(memc);
// Do not do this in your code, it is not supported.
uint32_t count = memcached_server_count(memc);
// Do not do this in your code, it is not supported.
- memc->servers[1].
state
.is_dead= true;
+ memc->servers[1].
options
.is_dead= true;
memc->state.is_time_for_rebuild= true;
uint32_t new_count= memcached_server_count(memc);
memc->state.is_time_for_rebuild= true;
uint32_t new_count= memcached_server_count(memc);
@@
-6297,8
+6300,6
@@
collection_st collection[] ={
{0, 0, 0, 0}
};
{0, 0, 0, 0}
};
-#define SERVERS_TO_CREATE 5
-
#include "libmemcached_world.h"
void get_world(world_st *world)
#include "libmemcached_world.h"
void get_world(world_st *world)