X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fparser.cc;h=32b0d9d84c0ff15c7b1bdcf301f2277c66c855fa;hb=92c077c9151360149e5a18a0adc222baa234ec80;hp=dd8062c287547d10a3a03b893f6c7adddfabf2c2;hpb=3645e647825396693c46a4de5d9e45dfde54dabd;p=m6w6%2Flibmemcached diff --git a/tests/parser.cc b/tests/parser.cc index dd8062c2..32b0d9d8 100644 --- a/tests/parser.cc +++ b/tests/parser.cc @@ -41,7 +41,6 @@ using namespace libtest; #include -#include #include #include #include @@ -99,11 +98,13 @@ 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_namespace(memcached_st *memc, const scanner_string_st &arg) +static test_return_t __check_namespace(memcached_st *, const scanner_string_st &) { +#if 0 const char *_namespace = memcached_get_namespace(memc); test_true(_namespace); test_strcmp(_namespace, arg.c_str); +#endif return TEST_SUCCESS; } @@ -221,12 +222,11 @@ 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 }, +#if 0 { ARRAY, make_scanner_string("--HASH=JENKINS"), scanner_string_null, NULL }, +#endif { 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} }; @@ -236,10 +236,10 @@ static test_return_t _test_option(scanner_variable_t *scanner, bool test_true_op for (scanner_variable_t *ptr= scanner; ptr->type != NIL; ptr++) { 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) + + // The case that it should have parsed, but it didn't. We will inspect for + // an error with libmemcached_check_configuration() + if (memc == NULL and test_true_opt) { char buffer[2048]; bool success= libmemcached_check_configuration(ptr->option.c_str, ptr->option.size, buffer, sizeof(buffer)); @@ -248,6 +248,7 @@ static test_return_t _test_option(scanner_variable_t *scanner, bool test_true_op temp+= " with option string:"; temp+= ptr->option.c_str; test_true_got(success, temp.c_str()); + Error << "Failed for " << temp; return TEST_FAILURE; // The line above should fail since memc should be null } @@ -335,11 +336,9 @@ test_return_t test_namespace_keyword(memcached_st*) test_return_t memcached_create_with_options_with_filename(memcached_st*) { - if (access(SUPPORT_EXAMPLE_CNF, R_OK)) - return TEST_SKIPPED; + test_skip(0, access(SUPPORT_EXAMPLE_CNF, R_OK)); - memcached_st *memc_ptr; - memc_ptr= memcached(test_literal_param("--CONFIGURE-FILE=\"support/example.cnf\"")); + memcached_st *memc_ptr= memcached(test_literal_param("--CONFIGURE-FILE=\"support/example.cnf\"")); test_true_got(memc_ptr, "memcached() failed"); memcached_free(memc_ptr); @@ -348,56 +347,58 @@ test_return_t memcached_create_with_options_with_filename(memcached_st*) test_return_t libmemcached_check_configuration_with_filename_test(memcached_st*) { - if (access(SUPPORT_EXAMPLE_CNF, R_OK)) - return TEST_SKIPPED; + test_skip(0, access(SUPPORT_EXAMPLE_CNF, R_OK)); - memcached_return_t rc; char buffer[BUFSIZ]; - 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)); + test_compare_hint(MEMCACHED_SUCCESS, + libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=\"support/example.cnf\""), buffer, sizeof(buffer)), + 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)); + test_compare_hint(MEMCACHED_SUCCESS, + libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=support/example.cnf"), buffer, sizeof(buffer)), + 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)); + test_compare_hint(MEMCACHED_ERRNO, + libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=\"bad-path/example.cnf\""), buffer, sizeof(buffer)), + buffer) ; return TEST_SUCCESS; } test_return_t libmemcached_check_configuration_test(memcached_st*) { - memcached_return_t rc; char buffer[BUFSIZ]; - test_compare(MEMCACHED_SUCCESS, libmemcached_check_configuration(test_literal_param("--server=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); + test_compare_hint(MEMCACHED_PARSE_ERROR, + libmemcached_check_configuration(test_literal_param("--dude=localhost"), buffer, sizeof(buffer)), + buffer); return TEST_SUCCESS; } test_return_t memcached_create_with_options_test(memcached_st*) { - memcached_st *memc_ptr; - memc_ptr= memcached(test_literal_param("--server=localhost")); - test_true_got(memc_ptr, memcached_last_error_message(memc_ptr)); - memcached_free(memc_ptr); + { + memcached_st *memc_ptr; + 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(test_literal_param("--dude=localhost")); - test_false_with(memc_ptr, memcached_last_error_message(memc_ptr)); + { + memcached_st *memc_ptr= memcached(test_literal_param("--dude=localhost")); + test_false_with(memc_ptr, memcached_last_error_message(memc_ptr)); + } return TEST_SUCCESS; } test_return_t test_include_keyword(memcached_st*) { - if (access(SUPPORT_EXAMPLE_CNF, R_OK)) - return TEST_SKIPPED; + test_skip(0, access(SUPPORT_EXAMPLE_CNF, R_OK)); char buffer[BUFSIZ]; test_compare(MEMCACHED_SUCCESS, @@ -434,7 +435,7 @@ test_return_t test_error_keyword(memcached_st*) return TEST_SUCCESS; } -#define RANDOM_STRINGS 100 +#define RANDOM_STRINGS 1000 test_return_t random_statement_build_test(memcached_st*) { std::vector option_list; @@ -457,6 +458,30 @@ test_return_t random_statement_build_test(memcached_st*) for (scanner_variable_t *ptr= hash_strings; ptr->type != NIL; ptr++) option_list.push_back(&ptr->option); + std::vector used_list; + used_list.resize(option_list.size()); + + struct used_options_st { + bool has_hash; + bool has_namespace; + bool has_distribution; + bool has_buffer_requests; + bool has_udp; + bool has_binary; + bool has_verify_key; + + used_options_st() : + has_hash(false), + has_namespace(false), + has_distribution(false), + has_buffer_requests(false), + has_udp(false), + has_binary(false), + has_verify_key(false) + { + } + } used_options; + for (uint32_t x= 0; x < RANDOM_STRINGS; x++) { std::string random_options; @@ -464,38 +489,127 @@ test_return_t random_statement_build_test(memcached_st*) uint32_t number_of= random() % option_list.size(); for (uint32_t options= 0; options < number_of; options++) { - random_options+= option_list[random() % option_list.size()]->c_str; - random_options+= " "; - } + size_t option_list_position= random() % option_list.size(); - memcached_st *memc_ptr= memcached(random_options.c_str(), random_options.size() -1); - if (not memc_ptr) - { - switch (errno) + if (used_list[option_list_position]) { - case EINVAL: -#if 0 // Testing framework is not smart enough for this just yet. + continue; + } + used_list[option_list_position]= true; + + std::string random_string= option_list[option_list_position]->c_str; + + if (random_string.compare(0, test_literal_compare_param("--HASH")) == 0) + { + if (used_options.has_hash) { - // We will try to find the specific error - char buffer[2048]; - memcached_return_t rc= libmemcached_check_configuration(random_options.c_str(), random_options.size(), buffer, sizeof(buffer)); - test_true_got(rc != MEMCACHED_SUCCESS, "memcached_create_with_options() failed whiled libmemcached_check_configuration() was successful"); - std::cerr << "Error occured on " << random_options.c_str() << " : " << buffer << std::endl; - return TEST_FAILURE; + continue; } -#endif - 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; + + if (used_options.has_distribution) + { + continue; + } + used_options.has_hash= true; } + + if (random_string.compare(0, test_literal_compare_param("--NAMESPACE")) == 0) + { + if (used_options.has_namespace) + { + continue; + } + used_options.has_namespace= true; + } + + if (random_string.compare(0, test_literal_compare_param("--USE-UDP")) == 0) + { + if (used_options.has_udp) + { + continue; + } + used_options.has_udp= true; + + if (used_options.has_buffer_requests) + { + continue; + } + } + + if (random_string.compare(0, test_literal_compare_param("--BUFFER-REQUESTS")) == 0) + { + if (used_options.has_buffer_requests) + { + continue; + } + used_options.has_buffer_requests= true; + + if (used_options.has_udp) + { + continue; + } + } + + if (random_string.compare(0, test_literal_compare_param("--BINARY-PROTOCOL")) == 0) + { + if (used_options.has_binary) + { + continue; + } + used_options.has_binary= true; + + if (used_options.has_verify_key) + { + continue; + } + } + + if (random_string.compare(0, test_literal_compare_param("--VERIFY-KEY")) == 0) + { + if (used_options.has_verify_key) + { + continue; + } + used_options.has_verify_key= true; + + if (used_options.has_binary) + { + continue; + } + } + + if (random_string.compare(0, test_literal_compare_param("--DISTRIBUTION")) == 0) + { + if (used_options.has_distribution) + { + continue; + } + + if (used_options.has_hash) + { + continue; + } + used_options.has_distribution= true; + } + + random_options+= random_string; + random_options+= " "; + } + + if (random_options.size() <= 1) + { + continue; + } + + random_options.resize(random_options.size() -1); + + char buffer[BUFSIZ]; + memcached_return_t rc= libmemcached_check_configuration(random_options.c_str(), random_options.size(), buffer, sizeof(buffer)); + if (memcached_failed(rc)) + { + Error << "libmemcached_check_configuration(" << random_options << ") : " << buffer; + return TEST_FAILURE; } - memcached_free(memc_ptr); } return TEST_SUCCESS; @@ -559,7 +673,7 @@ static memcached_return_t dump_socket_information(const memcached_st *, if (strcmp(memcached_server_name(instance), check->socket)) { - std::cerr << std::endl << __FILE__ << ":" << __LINE__ << " " << memcached_server_name(instance) << " != " << check->socket << std::endl; + Error << memcached_server_name(instance) << " != " << check->socket; return MEMCACHED_FAILURE; } @@ -648,11 +762,7 @@ 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); }