From 1fa5c40c04223a71dd3e617fc134d75a98da4ece Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Tue, 12 Feb 2013 04:18:24 -0500 Subject: Fix for bug in server for touch --- tests/libmemcached-1.0/touch.cc | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'tests') diff --git a/tests/libmemcached-1.0/touch.cc b/tests/libmemcached-1.0/touch.cc index 044273fd..9ce86f00 100644 --- a/tests/libmemcached-1.0/touch.cc +++ b/tests/libmemcached-1.0/touch.cc @@ -85,14 +85,14 @@ test_return_t test_memcached_touch(memcached_st *memc) free(value); } - test_compare(MEMCACHED_SUCCESS, - memcached_touch(memc, test_literal_param(__func__), 60 *60)); + rc= memcached_touch(memc, test_literal_param(__func__), 60 *60); + ASSERT_EQ_(MEMCACHED_SUCCESS, rc, "%s", memcached_last_error_message(memc)); rc= memcached_touch(memc, test_literal_param(__func__), 60 *60 *24 *60); - test_compare(MEMCACHED_SUCCESS, rc); + ASSERT_EQ_(MEMCACHED_SUCCESS, rc, "%s", memcached_last_error_message(memc)); - test_compare(MEMCACHED_NOTFOUND, - memcached_exist(memc, test_literal_param(__func__))); + rc= memcached_exist(memc, test_literal_param(__func__)); + ASSERT_EQ_(MEMCACHED_NOTFOUND, rc, "%s", memcached_last_error_message(memc)); return TEST_SUCCESS; } @@ -132,19 +132,20 @@ test_return_t test_memcached_touch_by_key(memcached_st *memc) free(value); } - test_compare(MEMCACHED_SUCCESS, - memcached_touch_by_key(memc, - test_literal_param("grouping_key"), - test_literal_param(__func__), - 60 *60)); + rc= memcached_touch_by_key(memc, + test_literal_param("grouping_key"), + test_literal_param(__func__), + 60 *60); + ASSERT_EQ_(MEMCACHED_SUCCESS, rc, "%s", memcached_last_error_message(memc)); - test_compare(MEMCACHED_SUCCESS, - memcached_touch_by_key(memc, - test_literal_param("grouping_key"), - test_literal_param(__func__), - 60 *60 *24 *60)); - test_compare(MEMCACHED_NOTFOUND, - memcached_exist_by_key(memc, test_literal_param("grouping_key"),test_literal_param(__func__))); + rc= memcached_touch_by_key(memc, + test_literal_param("grouping_key"), + test_literal_param(__func__), + 60 *60 *24 *60); + ASSERT_EQ_(MEMCACHED_SUCCESS, rc, "%s", memcached_last_error_message(memc)); + + rc= memcached_exist_by_key(memc, test_literal_param("grouping_key"),test_literal_param(__func__)); + ASSERT_EQ_(MEMCACHED_NOTFOUND, rc, "%s", memcached_last_error_message(memc)); return TEST_SUCCESS; } -- cgit v1.2.1