X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fparser.cc;h=b75ad41aef96f73db4b6d050853bb7c545a68f36;hb=1a237369acc2140ec76f46202dfde37047ef140d;hp=231a59b611d88c8afde37eda78c0cd981103e20b;hpb=1d076426d9ff399efc40d8556d8bc883b47ed87c;p=m6w6%2Flibmemcached diff --git a/tests/parser.cc b/tests/parser.cc index 231a59b6..b75ad41a 100644 --- a/tests/parser.cc +++ b/tests/parser.cc @@ -1,6 +1,6 @@ /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: * - * Gearmand client and server library. + * Libmemcached Client and Server * * Copyright (C) 2011 Data Differential, http://datadifferential.com/ * All rights reserved. @@ -41,6 +41,7 @@ #include #include +#define BUILDING_LIBMEMCACHED #include #include "tests/parser.h" @@ -117,17 +118,10 @@ static test_return_t __check_IO_MSG_WATERMARK(memcached_st *memc, const scanner_ return TEST_SUCCESS; } -static test_return_t __check_AUTO_EJECT_HOSTS(memcached_st *memc, const scanner_string_st &value) +static test_return_t __check_REMOVE_FAILED_SERVERS(memcached_st *memc, const scanner_string_st &value) { (void)value; - test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS)); - return TEST_SUCCESS; -} - -static test_return_t __check_CACHE_LOOKUPS(memcached_st *memc, const scanner_string_st &value) -{ - (void)value; - test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_CACHE_LOOKUPS)); + test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS)); return TEST_SUCCESS; } @@ -162,31 +156,34 @@ scanner_variable_t test_server_strings[]= { { NIL, scanner_string_null, scanner_string_null, NULL } }; -scanner_variable_t test_servers_strings[]= { - { ARRAY, make_scanner_string("--servers=localhost:11221,localhost:11222,localhost:11223,localhost:11224,localhost:11225"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--servers=a.example.com:81,localhost:82,b.example.com"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--servers=localhost,localhost:80"), scanner_string_null, NULL }, - { NIL, scanner_string_null, scanner_string_null, NULL} +scanner_variable_t test_server_strings_with_weights[]= { + { ARRAY, make_scanner_string("--server=10.0.2.1:30/?40"), make_scanner_string("10.0.2.1"), __check_host }, + { ARRAY, make_scanner_string("--server=example.com:1024/?30"), make_scanner_string("example.com"), __check_host }, + { ARRAY, make_scanner_string("--server=10.0.2.1/?20"), make_scanner_string("10.0.2.1"), __check_host }, + { ARRAY, make_scanner_string("--server=example.com/?10"), make_scanner_string("example.com"), __check_host }, + { NIL, scanner_string_null, scanner_string_null, NULL } }; - scanner_variable_t bad_test_strings[]= { { ARRAY, make_scanner_string("-servers=localhost:11221,localhost:11222,localhost:11223,localhost:11224,localhost:11225"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("-- servers=a.example.com:81,localhost:82,b.example.com"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--servers=localhost+80"), scanner_string_null, NULL}, + { ARRAY, make_scanner_string("--servers=localhost:+80"), scanner_string_null, NULL}, + { ARRAY, make_scanner_string("--servers=localhost.com."), scanner_string_null, NULL}, + { ARRAY, make_scanner_string("--server=localhost.com."), scanner_string_null, NULL}, + { ARRAY, make_scanner_string("--server=localhost.com.:80"), scanner_string_null, NULL}, { NIL, scanner_string_null, scanner_string_null, NULL} }; scanner_variable_t test_number_options[]= { { ARRAY, make_scanner_string("--CONNECT_TIMEOUT=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("--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("--SERVER_FAILURE_LIMIT=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 }, @@ -194,16 +191,9 @@ scanner_variable_t test_number_options[]= { }; scanner_variable_t test_boolean_options[]= { - { ARRAY, make_scanner_string("--AUTO_EJECT_HOSTS"), scanner_string_null, __check_AUTO_EJECT_HOSTS }, { ARRAY, make_scanner_string("--BINARY_PROTOCOL"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--BUFFER_REQUESTS"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--CACHE_LOOKUPS"), scanner_string_null, __check_CACHE_LOOKUPS }, -#if 0 // Not all platforms support - { ARRAY, make_scanner_string("--CORK"), scanner_string_null, NULL }, -#endif { ARRAY, make_scanner_string("--HASH_WITH_PREFIX_KEY"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--KETAMA"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--KETAMA_WEIGHTED"), 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 }, @@ -225,6 +215,8 @@ scanner_variable_t prefix_key_strings[]= { scanner_variable_t distribution_strings[]= { { ARRAY, make_scanner_string("--DISTRIBUTION=consistent"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--DISTRIBUTION=consistent,CRC"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--DISTRIBUTION=consistent,MD5"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--DISTRIBUTION=random"), scanner_string_null, __check_distribution_RANDOM }, { ARRAY, make_scanner_string("--DISTRIBUTION=modula"), scanner_string_null, NULL }, { NIL, scanner_string_null, scanner_string_null, NULL} @@ -256,13 +248,17 @@ static test_return_t _test_option(scanner_variable_t *scanner, bool test_true= t if (test_true) { if (rc != MEMCACHED_SUCCESS) + { memcached_error_print(memc); + } test_true(rc == MEMCACHED_SUCCESS); if (ptr->check_func) { - (*ptr->check_func)(memc, ptr->result); + test_return_t test_rc= (*ptr->check_func)(memc, ptr->result); + if (test_rc != TEST_SUCCESS) + return test_rc; } } else @@ -276,28 +272,19 @@ static test_return_t _test_option(scanner_variable_t *scanner, bool test_true= t return TEST_SUCCESS; } -test_return_t server_test(memcached_st *junk) +test_return_t server_test(memcached_st *) { - (void)junk; return _test_option(test_server_strings); } -test_return_t servers_test(memcached_st *junk) +test_return_t server_with_weight_test(memcached_st *) { - (void)junk; + return _test_option(test_server_strings_with_weights); +} +test_return_t servers_bad_test(memcached_st *) +{ test_return_t rc; - if ((rc= _test_option(test_server_strings)) != TEST_SUCCESS) - { - return rc; - } - -#if 0 - memcached_server_fn callbacks[1]; - callbacks[0]= server_print_callback; - memcached_server_cursor(memc, callbacks, NULL, 1); -#endif - if ((rc= _test_option(bad_test_strings, false)) != TEST_SUCCESS) { return rc; @@ -306,131 +293,167 @@ test_return_t servers_test(memcached_st *junk) return TEST_SUCCESS; } -test_return_t parser_number_options_test(memcached_st *junk) +test_return_t parser_number_options_test(memcached_st*) { - (void)junk; return _test_option(test_number_options); } -test_return_t parser_boolean_options_test(memcached_st *junk) +test_return_t parser_boolean_options_test(memcached_st*) { - (void)junk; return _test_option(test_boolean_options); } -test_return_t behavior_parser_test(memcached_st *junk) +test_return_t behavior_parser_test(memcached_st*) { - (void)junk; return TEST_SUCCESS; } -test_return_t parser_hash_test(memcached_st *junk) +test_return_t parser_hash_test(memcached_st*) { - (void)junk; return _test_option(hash_strings); } -test_return_t parser_distribution_test(memcached_st *junk) +test_return_t parser_distribution_test(memcached_st*) { - (void)junk; return _test_option(distribution_strings); } -test_return_t parser_key_prefix_test(memcached_st *junk) +test_return_t parser_key_prefix_test(memcached_st*) { - (void)junk; return _test_option(distribution_strings); } -test_return_t memcached_parse_configure_file_test(memcached_st *junk) +#define SUPPORT_EXAMPLE_CNF "support/example.cnf" + +test_return_t memcached_parse_configure_file_test(memcached_st*) { - (void)junk; + if (access(SUPPORT_EXAMPLE_CNF, R_OK)) + return TEST_SKIPPED; + memcached_st memc; memcached_st *memc_ptr= memcached_create(&memc); test_true(memc_ptr); - memcached_return_t rc= memcached_parse_configure_file(memc_ptr, memcached_string_with_size("support/example.cnf")); - test_true_got(rc == MEMCACHED_SUCCESS, memcached_last_error_message(memc_ptr) ? memcached_last_error_message(memc_ptr) : memcached_strerror(NULL, rc)); + memcached_set_configuration_file(memc_ptr, memcached_string_with_size(SUPPORT_EXAMPLE_CNF)); + memcached_reset(memc_ptr); memcached_free(memc_ptr); return TEST_SUCCESS; } -test_return_t memcached_create_with_options_with_filename(memcached_st *junk) +test_return_t memcached_create_with_options_with_filename(memcached_st*) { - (void)junk; + if (access(SUPPORT_EXAMPLE_CNF, R_OK)) + return TEST_SKIPPED; memcached_st *memc_ptr; memc_ptr= memcached_create_with_options(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\"")); - test_true(memc_ptr); + test_true_got(memc_ptr, memcached_last_error_message(memc_ptr)); memcached_free(memc_ptr); return TEST_SUCCESS; } -test_return_t libmemcached_check_configuration_with_filename_test(memcached_st *junk) +test_return_t libmemcached_check_configuration_with_filename_test(memcached_st*) { - (void)junk; + if (access(SUPPORT_EXAMPLE_CNF, R_OK)) + return TEST_SKIPPED; + memcached_return_t rc; + char buffer[BUFSIZ]; - rc= libmemcached_check_configuration(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\""), NULL, 0); - test_true(rc == MEMCACHED_SUCCESS); + 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(STRING_WITH_LEN("--CONFIGURE-FILE=support/example.cnf"), NULL, 0); - test_false(rc == MEMCACHED_SUCCESS); + 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(STRING_WITH_LEN("--CONFIGURE-FILE=\"bad-path/example.cnf\""), NULL, 0); - test_true_got(rc == MEMCACHED_ERRNO, 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); return TEST_SUCCESS; } -test_return_t libmemcached_check_configuration_test(memcached_st *junk) +test_return_t libmemcached_check_configuration_test(memcached_st*) { - (void)junk; - memcached_return_t rc; + char buffer[BUFSIZ]; - rc= libmemcached_check_configuration(STRING_WITH_LEN("--server=localhost"), NULL, 0); - test_true(rc == MEMCACHED_SUCCESS); + rc= libmemcached_check_configuration(STRING_WITH_LEN("--server=localhost"), buffer, sizeof(buffer)); + test_true_got(rc == MEMCACHED_SUCCESS, buffer); - rc= libmemcached_check_configuration(STRING_WITH_LEN("--dude=localhost"), NULL, 0); - test_false(rc == MEMCACHED_SUCCESS); + rc= libmemcached_check_configuration(STRING_WITH_LEN("--dude=localhost"), buffer, sizeof(buffer)); + test_false_with(rc == MEMCACHED_SUCCESS, buffer); test_true(rc == MEMCACHED_PARSE_ERROR); return TEST_SUCCESS; } -test_return_t memcached_create_with_options_test(memcached_st *junk) +test_return_t memcached_create_with_options_test(memcached_st*) { - (void)junk; - memcached_st *memc_ptr; memc_ptr= memcached_create_with_options(STRING_WITH_LEN("--server=localhost")); - test_true(memc_ptr); + 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")); - test_false(memc_ptr); + test_false_with(memc_ptr, memcached_last_error_message(memc_ptr)); return TEST_SUCCESS; } -#define RANDOM_STRINGS 10 -test_return_t random_statement_build_test(memcached_st *junk) +test_return_t test_include_keyword(memcached_st*) +{ + if (access(SUPPORT_EXAMPLE_CNF, R_OK)) + 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); + + return TEST_SUCCESS; +} + +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); + + return TEST_SUCCESS; +} + +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); + + return TEST_SUCCESS; +} + +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)); + test_true_got(rc != MEMCACHED_SUCCESS, buffer); + + return TEST_SUCCESS; +} + +#define RANDOM_STRINGS 100 +test_return_t random_statement_build_test(memcached_st*) { - (void)junk; std::vector option_list; for (scanner_variable_t *ptr= test_server_strings; ptr->type != NIL; ptr++) option_list.push_back(&ptr->option); -#if 0 - for (scanner_variable_t *ptr= test_servers_strings; ptr->type != NIL; ptr++) - option_list.push_back(&ptr->option); -#endif - for (scanner_variable_t *ptr= test_number_options; ptr->type != NIL; ptr++) option_list.push_back(&ptr->option); @@ -456,15 +479,16 @@ test_return_t random_statement_build_test(memcached_st *junk) random_options+= option_list[random() % option_list.size()]->c_str; random_options+= " "; } - random_options.resize(random_options.size() -1); memcached_return_t rc; - rc= libmemcached_check_configuration(random_options.c_str(), random_options.size(), NULL, 0); - if (rc != MEMCACHED_SUCCESS) + memcached_st *memc_ptr= memcached_create(NULL); + rc= memcached_parse_configuration(memc_ptr, random_options.c_str(), random_options.size() -1); + if (rc == MEMCACHED_PARSE_ERROR) { - std::cerr << "Failed to parse: (" << random_options << ")" << std::endl; - std::cerr << "\t " << memcached_strerror(NULL, rc) << std::endl; + std::cerr << std::endl << "Failed to parse(" << memcached_strerror(NULL, rc) << "): " << random_options << std::endl; + memcached_error_print(memc_ptr); } + memcached_free(memc_ptr); } return TEST_SUCCESS;