#include <cerrno>
#include <cassert>
+#include <libtest/test.hpp>
+
#define BUILDING_LIBMEMCACHED
// !NEVER use common.h, always use memcached.h in your own apps
#include <libmemcached/common.h>
#include <libmemcached/util.h>
-#include "tests/parser.h"
-#include "tests/print.h"
+#include <tests/parser.h>
+#include <tests/print.h>
enum scanner_type_t
{
return TEST_SKIPPED;
memcached_st *memc_ptr;
- memc_ptr= memcached(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\""));
+ memc_ptr= memcached(test_literal_param("--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);
memcached_return_t rc;
char buffer[BUFSIZ];
- rc= libmemcached_check_configuration(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\""), buffer, sizeof(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));
+ 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));
+ 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;
memcached_return_t rc;
char buffer[BUFSIZ];
- rc= libmemcached_check_configuration(STRING_WITH_LEN("--server=localhost"), buffer, sizeof(buffer));
+ rc= libmemcached_check_configuration(test_literal_param("--server=localhost"), buffer, sizeof(buffer));
test_true_got(rc == MEMCACHED_SUCCESS, 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);
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;
char buffer[BUFSIZ];
memcached_return_t rc;
- rc= libmemcached_check_configuration(STRING_WITH_LEN("INCLUDE \"support/example.cnf\""), buffer, sizeof(buffer));
+ rc= libmemcached_check_configuration(test_literal_param("INCLUDE \"support/example.cnf\""), buffer, sizeof(buffer));
test_true_got(rc == MEMCACHED_SUCCESS, buffer);
return TEST_SUCCESS;
{
char buffer[BUFSIZ];
memcached_return_t rc;
- rc= libmemcached_check_configuration(STRING_WITH_LEN("--server=localhost END bad keywords"), buffer, sizeof(buffer));
+ rc= libmemcached_check_configuration(test_literal_param("--server=localhost END bad keywords"), buffer, sizeof(buffer));
test_true_got(rc == MEMCACHED_SUCCESS, buffer);
return TEST_SUCCESS;
{
char buffer[BUFSIZ];
memcached_return_t rc;
- rc= libmemcached_check_configuration(STRING_WITH_LEN("--server=localhost reset --server=bad.com"), buffer, sizeof(buffer));
+ rc= libmemcached_check_configuration(test_literal_param("--server=localhost reset --server=bad.com"), buffer, sizeof(buffer));
test_true_got(rc == MEMCACHED_SUCCESS, buffer);
return TEST_SUCCESS;
{
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;
return TEST_SUCCESS;
}
-test_return_t regression_bug_71231153(memcached_st *)
+/*
+ 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;
- memcached_st *memc= memcached(memcached_literal_param("--SERVER=10.0.2.252 --CONNECT-TIMEOUT=1 --POLL-TIMEOUT=1"));
- test_true(memc);
- test_compare(1, memc->connect_timeout);
- test_compare(1, memc->poll_timeout);
+ { // 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_true_got(rc == MEMCACHED_TIMEOUT or rc == MEMCACHED_FAILURE or rc == MEMCACHED_ERRNO, memcached_strerror(memc, rc));
+ 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);
+ 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;
}