X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fparser.cc;h=b8b4f47af080f237b75e31ae4c720396d62fbc5c;hb=941deb278c78654f9cfeda6f343c79e2f10b746a;hp=32b0d9d84c0ff15c7b1bdcf301f2277c66c855fa;hpb=2674b74b067e8578bf323445a88f46bb3fa18ffd;p=m6w6%2Flibmemcached diff --git a/tests/libmemcached-1.0/parser.cc b/tests/libmemcached-1.0/parser.cc index 32b0d9d8..b8b4f47a 100644 --- a/tests/libmemcached-1.0/parser.cc +++ b/tests/libmemcached-1.0/parser.cc @@ -43,7 +43,6 @@ using namespace libtest; #include #include #include -#include #include #include @@ -621,19 +620,19 @@ static memcached_return_t dump_server_information(const memcached_st *, { if (strcmp(memcached_server_name(instance), "localhost")) { - assert(not memcached_server_name(instance)); + fatal_assert(not memcached_server_name(instance)); return MEMCACHED_FAILURE; } if (memcached_server_port(instance) < 8888 or memcached_server_port(instance) > 8892) { - assert(not memcached_server_port(instance)); + fatal_assert(not memcached_server_port(instance)); return MEMCACHED_FAILURE; } if (instance->weight > 5 or instance->weight < 2) { - assert(not instance->weight); + fatal_assert(not instance->weight); return MEMCACHED_FAILURE; } @@ -762,7 +761,11 @@ test_return_t regression_bug_71231153_poll(memcached_st *) char *value= memcached_get(memc, test_literal_param("test"), &value_len, NULL, &rc); test_false(value); test_zero(value_len); +#ifdef __APPLE__ + test_compare_got(MEMCACHED_CONNECTION_FAILURE, rc, memcached_last_error_message(memc)); +#else test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_last_error_message(memc)); +#endif memcached_free(memc); }