From 01f53826c5548c22ee7bd11f0182bd71f8f3264c Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Tue, 19 Feb 2013 17:51:52 -0500 Subject: [PATCH] Bump required version for touch. --- tests/libmemcached-1.0/touch.cc | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/tests/libmemcached-1.0/touch.cc b/tests/libmemcached-1.0/touch.cc index a0e1afb3..08ff68f4 100644 --- a/tests/libmemcached-1.0/touch.cc +++ b/tests/libmemcached-1.0/touch.cc @@ -48,14 +48,13 @@ using namespace libtest; static test_return_t pre_touch(memcached_st *memc) { test_compare(MEMCACHED_SUCCESS, memcached_version(memc)); - test_skip(true, libmemcached_util_version_check(memc, 1, 4, 8)); + test_skip(true, libmemcached_util_version_check(memc, 1, 4, 15)); return TEST_SUCCESS; } test_return_t test_memcached_touch(memcached_st *memc) { - test_skip(TEST_SUCCESS, pre_touch(memc)); size_t len; @@ -88,21 +87,17 @@ test_return_t test_memcached_touch(memcached_st *memc) rc= memcached_touch(memc, test_literal_param(__func__), 60 *60); ASSERT_EQ_(MEMCACHED_SUCCESS, rc, "%s", memcached_last_error_message(memc)); - if (libmemcached_util_version_check(memc, 1, 2, 15)) - { - rc= memcached_touch(memc, test_literal_param(__func__), 60 *60 *24 *60); - ASSERT_EQ_(MEMCACHED_SUCCESS, rc, "%s", memcached_last_error_message(memc)); + rc= memcached_touch(memc, test_literal_param(__func__), 60 *60 *24 *60); + ASSERT_EQ_(MEMCACHED_SUCCESS, rc, "%s", memcached_last_error_message(memc)); - rc= memcached_exist(memc, test_literal_param(__func__)); - ASSERT_EQ_(MEMCACHED_NOTFOUND, rc, "%s", memcached_last_error_message(memc)); - } + rc= memcached_exist(memc, test_literal_param(__func__)); + ASSERT_EQ_(MEMCACHED_NOTFOUND, rc, "%s", memcached_last_error_message(memc)); return TEST_SUCCESS; } test_return_t test_memcached_touch_by_key(memcached_st *memc) { - test_skip(TEST_SUCCESS, pre_touch(memc)); size_t len; @@ -141,17 +136,14 @@ test_return_t test_memcached_touch_by_key(memcached_st *memc) 60 *60); ASSERT_EQ_(MEMCACHED_SUCCESS, rc, "%s", memcached_last_error_message(memc)); - if (libmemcached_util_version_check(memc, 1, 2, 15)) - { - 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_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)); - } + 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; } -- 2.30.2