projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
tests: honor EPIPE in kill(HUP) test
[awesomized/libmemcached]
/
tests
/
libmemcached-1.0
/
mem_functions.cc
diff --git
a/tests/libmemcached-1.0/mem_functions.cc
b/tests/libmemcached-1.0/mem_functions.cc
index 8b2dc606f08f850c5e04894ef8e2f2fca497e598..9c6ab3deb2bbd1d3f762a53f706417f54f57428a 100644
(file)
--- a/
tests/libmemcached-1.0/mem_functions.cc
+++ b/
tests/libmemcached-1.0/mem_functions.cc
@@
-466,7
+466,7
@@
test_return_t libmemcached_string_behavior_test(memcached_st *)
{
test_true(libmemcached_string_behavior(memcached_behavior_t(x)));
}
{
test_true(libmemcached_string_behavior(memcached_behavior_t(x)));
}
- test_compare(3
7
, int(MEMCACHED_BEHAVIOR_MAX));
+ test_compare(3
8
, int(MEMCACHED_BEHAVIOR_MAX));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-717,7
+717,7
@@
test_return_t cas_test(memcached_st *memc)
test_compare(MEMCACHED_SUCCESS, memcached_flush(memc, 0));
test_compare(MEMCACHED_SUCCESS, memcached_flush(memc, 0));
- test_
skip(true
, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, true));
+ test_
compare(MEMCACHED_SUCCESS
, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, true));
test_compare(MEMCACHED_SUCCESS,
memcached_set(memc,
test_compare(MEMCACHED_SUCCESS,
memcached_set(memc,
@@
-4848,7
+4848,7
@@
test_return_t regression_bug_1251482(memcached_st*)
memcached_behavior_set(&memc, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, 0);
memcached_behavior_set(&memc, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, 0);
- for (size_t x=
4; x; --
x)
+ for (size_t x=
0; x < 5; ++
x)
{
size_t value_length;
memcached_return_t rc;
{
size_t value_length;
memcached_return_t rc;
@@
-4858,7
+4858,11
@@
test_return_t regression_bug_1251482(memcached_st*)
test_false(value);
test_compare(0LLU, value_length);
test_false(value);
test_compare(0LLU, value_length);
- test_compare(MEMCACHED_CONNECTION_FAILURE, rc);
+ if (x) {
+ test_ne_compare(MEMCACHED_SUCCESS, rc);
+ } else {
+ test_compare(MEMCACHED_CONNECTION_FAILURE, rc);
+ }
}
return TEST_SUCCESS;
}
return TEST_SUCCESS;
@@
-5079,8
+5083,11
@@
test_return_t kill_HUP_TEST(memcached_st *original_memc)
test_literal_param(__func__), // Keys
test_literal_param(__func__), // Values
0, 0);
test_literal_param(__func__), // Keys
test_literal_param(__func__), // Values
0, 0);
- test_compare(ret, memc);
- test_compare(MEMCACHED_CONNECTION_FAILURE, memc);
+ if (ret == MEMCACHED_ERRNO) {
+ test_compare(EPIPE, memcached_last_error_errno(memc));
+ } else {
+ test_compare(MEMCACHED_CONNECTION_FAILURE, ret);
+ }
memcached_free(memc);
memcached_free(memc);