Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-218

[m6w6/libmemcached] / tests / libmemcached-1.0 / touch.cc

diff --git a/tests/libmemcached-1.0/touch.cc b/tests/libmemcached-1.0/touch.cc
index 425e308cc3a7593849e2b1b018a7918d0fac384b..044273fd4d0a2d5a7c3033bfebdc598d614a27f8 100644 (file)
--- a/tests/libmemcached-1.0/touch.cc
+++ b/tests/libmemcached-1.0/touch.cc
@@ -35,7 +35,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
@@ -88,10 +88,8 @@ test_return_t test_memcached_touch(memcached_st *memc)
   test_compare(MEMCACHED_SUCCESS,
                memcached_touch(memc, test_literal_param(__func__), 60 *60));
 
-  test_skip(false ,memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL));
-
   rc= memcached_touch(memc, test_literal_param(__func__), 60 *60 *24 *60);
-  test_compare_hint(MEMCACHED_SUCCESS, rc, memcached_last_error_message(memc));
+  test_compare(MEMCACHED_SUCCESS, rc);
 
   test_compare(MEMCACHED_NOTFOUND,
                memcached_exist(memc, test_literal_param(__func__)));
@@ -140,7 +138,6 @@ test_return_t test_memcached_touch_by_key(memcached_st *memc)
                                       test_literal_param(__func__),
                                       60 *60));
 
-  test_skip(false ,memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL));
   test_compare(MEMCACHED_SUCCESS,
                memcached_touch_by_key(memc,
                                       test_literal_param("grouping_key"),