X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fparser.cc;h=898fdb54a73494e9b21403e94e2f365b393c98a8;hb=8c24eaae6772f7e27d6f638d3953d8c790068724;hp=1c2fc504b727b56fe78d9ec9724ae82221bb8b67;hpb=93e6d035437caee63345d1d9dcf2738e84456f9f;p=m6w6%2Flibmemcached diff --git a/tests/parser.cc b/tests/parser.cc index 1c2fc504..898fdb54 100644 --- a/tests/parser.cc +++ b/tests/parser.cc @@ -36,17 +36,21 @@ */ #include +#include + +using namespace libtest; #include #include #include -#include +#include +#include -#define BUILDING_LIBMEMCACHED #include +#include -#include "tests/parser.h" -#include "tests/print.h" +#include +#include enum scanner_type_t { @@ -95,16 +99,11 @@ static test_return_t __check_host(memcached_st *memc, const scanner_string_st &h } // Check and make sure the prefix_key is what we expect it to be -static test_return_t __check_prefix_key(memcached_st *memc, const scanner_string_st &hostname) +static test_return_t __check_namespace(memcached_st *memc, const scanner_string_st &arg) { - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, 0); - - test_true(instance); - - const char *first_hostname = memcached_server_name(instance); - test_true(first_hostname); - test_strcmp(first_hostname, hostname.c_str); + const char *_namespace = memcached_get_namespace(memc); + test_true(_namespace); + test_strcmp(_namespace, arg.c_str); return TEST_SUCCESS; } @@ -203,10 +202,10 @@ scanner_variable_t test_boolean_options[]= { { NIL, scanner_string_null, scanner_string_null, NULL} }; -scanner_variable_t prefix_key_strings[]= { - { 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 }, +scanner_variable_t namespace_strings[]= { + { ARRAY, make_scanner_string("--NAMESPACE=foo"), make_scanner_string("foo"), __check_namespace }, + { ARRAY, make_scanner_string("--NAMESPACE=\"foo\""), make_scanner_string("foo"), __check_namespace }, + { ARRAY, make_scanner_string("--NAMESPACE=\"This_is_a_very_long_key\""), make_scanner_string("This_is_a_very_long_key"), __check_namespace }, { NIL, scanner_string_null, scanner_string_null, NULL} }; @@ -222,35 +221,36 @@ scanner_variable_t distribution_strings[]= { scanner_variable_t hash_strings[]= { { ARRAY, make_scanner_string("--HASH=CRC"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--HASH=FNV1A_32"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--HASH=FNV1A_64"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--HASH=FNV1_32"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--HASH=FNV1_64"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--HASH=JENKINS"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--HASH=MD5"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--HASH=MURMUR"), scanner_string_null, NULL }, { NIL, scanner_string_null, scanner_string_null, NULL} }; -static test_return_t _test_option(scanner_variable_t *scanner, bool test_true= true) +static test_return_t _test_option(scanner_variable_t *scanner, bool test_true_opt= true) { - (void)test_true; - for (scanner_variable_t *ptr= scanner; ptr->type != NIL; ptr++) { - memcached_st *memc; - memc= memcached(ptr->option.c_str, ptr->option.size); - if (test_true) + memcached_st *memc= memcached(ptr->option.c_str, ptr->option.size); + + // The case that it should have parsed, but it didn't. We will inspect + // for an error with libmemcached_check_configuration() + if (not memc and test_true_opt) { - if (not memc) - { - char buffer[2048]; - memcached_return_t rc= libmemcached_check_configuration(ptr->option.c_str, ptr->option.size, buffer, sizeof(buffer)); - std::cerr << "About error for " << memcached_strerror(NULL, rc) << " : " << buffer << std::endl; - } + char buffer[2048]; + bool success= libmemcached_check_configuration(ptr->option.c_str, ptr->option.size, buffer, sizeof(buffer)); - test_true(memc); + std::string temp(buffer); + temp+= " with option string:"; + temp+= ptr->option.c_str; + test_true_got(success, temp.c_str()); + return TEST_FAILURE; // The line above should fail since memc should be null + } + + if (test_true_opt) + { if (ptr->check_func) { test_return_t test_rc= (*ptr->check_func)(memc, ptr->result); @@ -323,6 +323,11 @@ test_return_t parser_key_prefix_test(memcached_st*) return _test_option(distribution_strings); } +test_return_t test_namespace_keyword(memcached_st*) +{ + return _test_option(namespace_strings); +} + #define SUPPORT_EXAMPLE_CNF "support/example.cnf" test_return_t memcached_create_with_options_with_filename(memcached_st*) @@ -331,8 +336,8 @@ test_return_t memcached_create_with_options_with_filename(memcached_st*) return TEST_SKIPPED; memcached_st *memc_ptr; - memc_ptr= memcached(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\"")); - test_true_got(memc_ptr, memcached_last_error_message(memc_ptr)); + memc_ptr= memcached(test_literal_param("--CONFIGURE-FILE=\"support/example.cnf\"")); + test_true_got(memc_ptr, "memcached() failed"); memcached_free(memc_ptr); return TEST_SUCCESS; @@ -346,14 +351,14 @@ test_return_t libmemcached_check_configuration_with_filename_test(memcached_st*) memcached_return_t rc; 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); + rc= libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=\"support/example.cnf\""), buffer, sizeof(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); + rc= libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=support/example.cnf"), buffer, sizeof(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); + rc= libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=\"bad-path/example.cnf\""), buffer, sizeof(buffer)); + test_true_got(rc == MEMCACHED_ERRNO, memcached_strerror(NULL, rc)); return TEST_SUCCESS; } @@ -363,10 +368,10 @@ test_return_t libmemcached_check_configuration_test(memcached_st*) memcached_return_t rc; char buffer[BUFSIZ]; - rc= libmemcached_check_configuration(STRING_WITH_LEN("--server=localhost"), buffer, sizeof(buffer)); - test_true_got(rc == MEMCACHED_SUCCESS, buffer); + test_compare(MEMCACHED_SUCCESS, + libmemcached_check_configuration(test_literal_param("--server=localhost"), buffer, sizeof(buffer))); - rc= libmemcached_check_configuration(STRING_WITH_LEN("--dude=localhost"), buffer, sizeof(buffer)); + rc= libmemcached_check_configuration(test_literal_param("--dude=localhost"), buffer, sizeof(buffer)); test_false_with(rc == MEMCACHED_SUCCESS, buffer); test_true(rc == MEMCACHED_PARSE_ERROR); @@ -376,11 +381,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(STRING_WITH_LEN("--server=localhost")); + memc_ptr= memcached(test_literal_param("--server=localhost")); test_true_got(memc_ptr, memcached_last_error_message(memc_ptr)); memcached_free(memc_ptr); - memc_ptr= memcached(STRING_WITH_LEN("--dude=localhost")); + memc_ptr= memcached(test_literal_param("--dude=localhost")); test_false_with(memc_ptr, memcached_last_error_message(memc_ptr)); return TEST_SUCCESS; @@ -392,9 +397,8 @@ test_return_t test_include_keyword(memcached_st*) return TEST_SKIPPED; char buffer[BUFSIZ]; - memcached_return_t rc; - rc= libmemcached_check_configuration(STRING_WITH_LEN("INCLUDE \"support/example.cnf\""), buffer, sizeof(buffer)); - test_true_got(rc == MEMCACHED_SUCCESS, buffer); + test_compare(MEMCACHED_SUCCESS, + libmemcached_check_configuration(test_literal_param("INCLUDE \"support/example.cnf\""), buffer, sizeof(buffer))); return TEST_SUCCESS; } @@ -402,9 +406,8 @@ test_return_t test_include_keyword(memcached_st*) test_return_t test_end_keyword(memcached_st*) { char buffer[BUFSIZ]; - memcached_return_t rc; - rc= libmemcached_check_configuration(STRING_WITH_LEN("--server=localhost END bad keywords"), buffer, sizeof(buffer)); - test_true_got(rc == MEMCACHED_SUCCESS, buffer); + test_compare(MEMCACHED_SUCCESS, + libmemcached_check_configuration(test_literal_param("--server=localhost END bad keywords"), buffer, sizeof(buffer))); return TEST_SUCCESS; } @@ -412,9 +415,8 @@ test_return_t test_end_keyword(memcached_st*) test_return_t test_reset_keyword(memcached_st*) { char buffer[BUFSIZ]; - memcached_return_t rc; - rc= libmemcached_check_configuration(STRING_WITH_LEN("--server=localhost reset --server=bad.com"), buffer, sizeof(buffer)); - test_true_got(rc == MEMCACHED_SUCCESS, buffer); + test_compare(MEMCACHED_SUCCESS, + libmemcached_check_configuration(test_literal_param("--server=localhost reset --server=bad.com"), buffer, sizeof(buffer))); return TEST_SUCCESS; } @@ -423,7 +425,7 @@ test_return_t test_error_keyword(memcached_st*) { char buffer[BUFSIZ]; memcached_return_t rc; - rc= libmemcached_check_configuration(STRING_WITH_LEN("--server=localhost ERROR --server=bad.com"), buffer, sizeof(buffer)); + rc= libmemcached_check_configuration(test_literal_param("--server=localhost ERROR --server=bad.com"), buffer, sizeof(buffer)); test_true_got(rc != MEMCACHED_SUCCESS, buffer); return TEST_SUCCESS; @@ -443,7 +445,7 @@ test_return_t random_statement_build_test(memcached_st*) for (scanner_variable_t *ptr= test_boolean_options; ptr->type != NIL; ptr++) option_list.push_back(&ptr->option); - for (scanner_variable_t *ptr= prefix_key_strings; ptr->type != NIL; ptr++) + for (scanner_variable_t *ptr= namespace_strings; ptr->type != NIL; ptr++) option_list.push_back(&ptr->option); for (scanner_variable_t *ptr= distribution_strings; ptr->type != NIL; ptr++) @@ -495,3 +497,162 @@ 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]; + + test_compare_got(MEMCACHED_SUCCESS, + libmemcached_check_configuration(server_string, strlen(server_string), buffer, sizeof(buffer)), buffer); + + 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; +} + +struct socket_weight_t { + const char *socket; + size_t weight; +}; + +static memcached_return_t dump_socket_information(const memcached_st *, + const memcached_server_st *instance, + void *context) +{ + socket_weight_t *check= (socket_weight_t *)context; + + if (strcmp(memcached_server_name(instance), check->socket)) + { + std::cerr << std::endl << __FILE__ << ":" << __LINE__ << " " << memcached_server_name(instance) << " != " << check->socket << std::endl; + return MEMCACHED_FAILURE; + } + + if (instance->weight == check->weight) + { + return MEMCACHED_SUCCESS; + } + + return MEMCACHED_FAILURE; +} + +test_return_t test_parse_socket(memcached_st *) +{ + char buffer[BUFSIZ]; + + memcached_server_fn callbacks[]= { dump_socket_information }; + { + test_compare_got(MEMCACHED_SUCCESS, + libmemcached_check_configuration(test_literal_param("--socket=\"/tmp/foo\""), buffer, sizeof(buffer)), + buffer); + + memcached_st *memc= memcached(test_literal_param("--socket=\"/tmp/foo\"")); + test_true(memc); + socket_weight_t check= { "/tmp/foo", 1 }; + test_compare(MEMCACHED_SUCCESS, + memcached_server_cursor(memc, callbacks, &check, 1)); + memcached_free(memc); + } + + { + test_compare_got(MEMCACHED_SUCCESS, + libmemcached_check_configuration(test_literal_param("--socket=\"/tmp/foo\"/?23"), buffer, sizeof(buffer)), + buffer); + + memcached_st *memc= memcached(test_literal_param("--socket=\"/tmp/foo\"/?23")); + test_true(memc); + socket_weight_t check= { "/tmp/foo", 23 }; + test_compare(MEMCACHED_SUCCESS, + memcached_server_cursor(memc, callbacks, &check, 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(test_literal_param("--SERVER=10.0.2.252 --CONNECT-TIMEOUT=0")); + test_true(memc); + test_zero(memc->connect_timeout); + test_compare(MEMCACHED_DEFAULT_TIMEOUT, memc->poll_timeout); + + memcached_return_t rc; + size_t value_len; + char *value= memcached_get(memc, test_literal_param("test"), &value_len, NULL, &rc); + test_false(value); + test_zero(value_len); + test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_last_error_message(memc)); + + 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(test_literal_param("--SERVER=10.0.2.252 --POLL-TIMEOUT=0")); + test_true(memc); + test_compare(MEMCACHED_DEFAULT_CONNECT_TIMEOUT, memc->connect_timeout); + test_zero(memc->poll_timeout); + + memcached_return_t rc; + size_t value_len; + 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); + } + + return TEST_SUCCESS; +}