X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fparser.cc;h=bb2de83f3ba3be786184a1e8df7c34ca74dbe405;hb=625e84ebfc422790372bc2984f504bdcb4da779c;hp=900e89a7631ba73a14a0bfea7d38f18774471f87;hpb=54f01e08b61f4463a9659da7b329c7de04a41dce;p=m6w6%2Flibmemcached diff --git a/tests/parser.cc b/tests/parser.cc index 900e89a7..bb2de83f 100644 --- a/tests/parser.cc +++ b/tests/parser.cc @@ -40,10 +40,13 @@ #include #include #include -#include +#include +#include #define BUILDING_LIBMEMCACHED -#include +// !NEVER use common.h, always use memcached.h in your own apps +#include +#include #include "tests/parser.h" #include "tests/print.h" @@ -172,41 +175,41 @@ scanner_variable_t bad_test_strings[]= { }; scanner_variable_t test_number_options[]= { - { ARRAY, make_scanner_string("--CONNECT_TIMEOUT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--IO_BYTES_WATERMARK=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--IO_KEY_PREFETCH=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--IO_MSG_WATERMARK=456"), make_scanner_string("456"), __check_IO_MSG_WATERMARK }, - { ARRAY, make_scanner_string("--NUMBER_OF_REPLICAS=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--POLL_TIMEOUT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--RCV_TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--CONNECT-TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--IO-BYTES-WATERMARK=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--IO-KEY-PREFETCH=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--IO-MSG-WATERMARK=456"), make_scanner_string("456"), __check_IO_MSG_WATERMARK }, + { ARRAY, make_scanner_string("--NUMBER-OF-REPLICAS=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--POLL-TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--RCV-TIMEOUT=456"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--REMOVE-FAILED-SERVERS=3"), scanner_string_null, __check_REMOVE_FAILED_SERVERS }, - { ARRAY, make_scanner_string("--RETRY_TIMEOUT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SND_TIMEOUT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SOCKET_RECV_SIZE=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SOCKET_SEND_SIZE=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--RETRY-TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SND-TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SOCKET-RECV-SIZE=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SOCKET-SEND-SIZE=456"), scanner_string_null, NULL }, { NIL, scanner_string_null, scanner_string_null, NULL} }; scanner_variable_t test_boolean_options[]= { - { ARRAY, make_scanner_string("--BINARY_PROTOCOL"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--BUFFER_REQUESTS"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--HASH_WITH_PREFIX_KEY"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--BINARY-PROTOCOL"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--BUFFER-REQUESTS"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--HASH-WITH-NAMESPACE"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--NOREPLY"), scanner_string_null, __check_NOREPLY }, - { ARRAY, make_scanner_string("--RANDOMIZE_REPLICA_READ"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SORT_HOSTS"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SUPPORT_CAS"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--TCP_NODELAY"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--TCP_KEEPALIVE"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--TCP_KEEPIDLE"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--USE_UDP"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--VERIFY_KEY"), scanner_string_null, __check_VERIFY_KEY }, + { ARRAY, make_scanner_string("--RANDOMIZE-REPLICA-READ"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SORT-HOSTS"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SUPPORT-CAS"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--TCP-NODELAY"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--TCP-KEEPALIVE"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--TCP-KEEPIDLE"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--USE-UDP"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--VERIFY-KEY"), scanner_string_null, __check_VERIFY_KEY }, { NIL, scanner_string_null, scanner_string_null, NULL} }; scanner_variable_t prefix_key_strings[]= { - { ARRAY, make_scanner_string("--PREFIX_KEY=foo"), make_scanner_string("foo"), __check_prefix_key }, - { ARRAY, make_scanner_string("--PREFIX-KEY=\"foo\""), make_scanner_string("foo"), __check_prefix_key }, - { ARRAY, make_scanner_string("--PREFIX-KEY=\"This_is_a_very_long_key\""), make_scanner_string("This_is_a_very_long_key"), __check_prefix_key }, + { ARRAY, make_scanner_string("--NAMESPACE=foo"), make_scanner_string("foo"), __check_prefix_key }, + { ARRAY, make_scanner_string("--NAMESPACE=\"foo\""), make_scanner_string("foo"), __check_prefix_key }, + { ARRAY, make_scanner_string("--NAMESPACE=\"This_is_a_very_long_key\""), make_scanner_string("This_is_a_very_long_key"), __check_prefix_key }, { NIL, scanner_string_null, scanner_string_null, NULL} }; @@ -239,7 +242,7 @@ static test_return_t _test_option(scanner_variable_t *scanner, bool test_true= t for (scanner_variable_t *ptr= scanner; ptr->type != NIL; ptr++) { memcached_st *memc; - memc= memcached_create_with_options(ptr->option.c_str, ptr->option.size); + memc= memcached(ptr->option.c_str, ptr->option.size); if (test_true) { if (not memc) @@ -331,8 +334,9 @@ test_return_t memcached_create_with_options_with_filename(memcached_st*) return TEST_SKIPPED; memcached_st *memc_ptr; - memc_ptr= memcached_create_with_options(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\"")); - test_true_got(memc_ptr, memcached_last_error_message(memc_ptr)); + memc_ptr= memcached(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\"")); + test_true_got(memc_ptr, "memcached() failed"); + test_strcmp(SUPPORT_EXAMPLE_CNF, memcached_array_string(memc_ptr->configure.filename)); memcached_free(memc_ptr); return TEST_SUCCESS; @@ -347,13 +351,13 @@ test_return_t libmemcached_check_configuration_with_filename_test(memcached_st*) char buffer[BUFSIZ]; rc= libmemcached_check_configuration(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\""), buffer, sizeof(buffer)); - test_true_got(rc == MEMCACHED_SUCCESS, buffer); + test_true_got(rc == MEMCACHED_SUCCESS, (rc == MEMCACHED_ERRNO) ? strerror(errno) : memcached_strerror(NULL, rc)); rc= libmemcached_check_configuration(STRING_WITH_LEN("--CONFIGURE-FILE=support/example.cnf"), buffer, sizeof(buffer)); - test_false_with(rc == MEMCACHED_SUCCESS, buffer); + test_false_with(rc == MEMCACHED_SUCCESS, memcached_strerror(NULL, rc)); rc= libmemcached_check_configuration(STRING_WITH_LEN("--CONFIGURE-FILE=\"bad-path/example.cnf\""), buffer, sizeof(buffer)); - test_true_got(rc == MEMCACHED_ERRNO, buffer); + test_true_got(rc == MEMCACHED_ERRNO, memcached_strerror(NULL, rc)); return TEST_SUCCESS; } @@ -376,11 +380,11 @@ test_return_t libmemcached_check_configuration_test(memcached_st*) test_return_t memcached_create_with_options_test(memcached_st*) { memcached_st *memc_ptr; - memc_ptr= memcached_create_with_options(STRING_WITH_LEN("--server=localhost")); + memc_ptr= memcached(STRING_WITH_LEN("--server=localhost")); test_true_got(memc_ptr, memcached_last_error_message(memc_ptr)); memcached_free(memc_ptr); - memc_ptr= memcached_create_with_options(STRING_WITH_LEN("--dude=localhost")); + memc_ptr= memcached(STRING_WITH_LEN("--dude=localhost")); test_false_with(memc_ptr, memcached_last_error_message(memc_ptr)); return TEST_SUCCESS; @@ -463,8 +467,7 @@ test_return_t random_statement_build_test(memcached_st*) random_options+= " "; } - memcached_st *memc_ptr= memcached_create(NULL); - memc_ptr= memcached_create_with_options(random_options.c_str(), random_options.size() -1); + memcached_st *memc_ptr= memcached(random_options.c_str(), random_options.size() -1); if (not memc_ptr) { switch (errno) @@ -483,9 +486,11 @@ test_return_t random_statement_build_test(memcached_st*) break; case ENOMEM: std::cerr << "Failed to allocate memory for memcached_create_with_options()" << std::endl; + memcached_free(memc_ptr); return TEST_FAILURE; default: std::cerr << "Unknown error from memcached_create_with_options?!!" << std::endl; + memcached_free(memc_ptr); return TEST_FAILURE; } } @@ -494,3 +499,101 @@ test_return_t random_statement_build_test(memcached_st*) return TEST_SUCCESS; } + +static memcached_return_t dump_server_information(const memcached_st *, + const memcached_server_st *instance, + void *) +{ + if (strcmp(memcached_server_name(instance), "localhost")) + { + 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)); + return MEMCACHED_FAILURE; + } + + if (instance->weight > 5 or instance->weight < 2) + { + assert(not instance->weight); + return MEMCACHED_FAILURE; + } + + return MEMCACHED_SUCCESS; +} + + +test_return_t test_hostname_port_weight(memcached_st *) +{ + const char *server_string= "--server=localhost:8888/?2 --server=localhost:8889/?3 --server=localhost:8890/?4 --server=localhost:8891/?5 --server=localhost:8892/?3"; + char buffer[BUFSIZ]; + + memcached_return_t rc; + test_compare_got(MEMCACHED_SUCCESS, + rc= libmemcached_check_configuration(server_string, strlen(server_string), buffer, sizeof(buffer)), + memcached_strerror(NULL, rc)); + + memcached_st *memc= memcached(server_string, strlen(server_string)); + test_true(memc); + + memcached_server_fn callbacks[]= { dump_server_information }; + test_true(memcached_success(memcached_server_cursor(memc, callbacks, NULL, 1))); + + memcached_free(memc); + + return TEST_SUCCESS; +} + +/* + By setting the timeout value to zero, we force poll() to return immediatly. +*/ +test_return_t regression_bug_71231153_connect(memcached_st *) +{ + if (libmemcached_util_ping("10.0.2.252", 0, NULL)) // If for whatever reason someone has a host at this address, skip + return TEST_SKIPPED; + + { // Test the connect-timeout, on a bad host we should get MEMCACHED_CONNECTION_FAILURE + memcached_st *memc= memcached(memcached_literal_param("--SERVER=10.0.2.252 --CONNECT-TIMEOUT=0")); + test_true(memc); + test_compare(0, memc->connect_timeout); + test_compare(MEMCACHED_DEFAULT_TIMEOUT, memc->poll_timeout); + + memcached_return_t rc; + size_t value_len; + char *value= memcached_get(memc, memcached_literal_param("test"), &value_len, NULL, &rc); + test_false(value); + test_compare(0, value_len); + test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_strerror(NULL, rc)); + + memcached_free(memc); + } + + return TEST_SUCCESS; +} + +test_return_t regression_bug_71231153_poll(memcached_st *) +{ + if (libmemcached_util_ping("10.0.2.252", 0, NULL)) // If for whatever reason someone has a host at this address, skip + return TEST_SKIPPED; + + { // Test the poll timeout, on a bad host we should get MEMCACHED_CONNECTION_FAILURE + memcached_st *memc= memcached(memcached_literal_param("--SERVER=10.0.2.252 --POLL-TIMEOUT=0")); + test_true(memc); + test_compare(MEMCACHED_DEFAULT_CONNECT_TIMEOUT, memc->connect_timeout); + test_compare(0, memc->poll_timeout); + + memcached_return_t rc; + size_t value_len; + char *value= memcached_get(memc, memcached_literal_param("test"), &value_len, NULL, &rc); + test_false(value); + test_compare(0, value_len); + test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_strerror(NULL, rc)); + + memcached_free(memc); + } + + return TEST_SUCCESS; +}