X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Ftests%2Fmemcached%2Ftouch.cpp;fp=test%2Ftests%2Fmemcached%2Ftouch.cpp;h=fa865b786f159a62b36f511b636a470b6c65eb1c;hb=5a6a6ab8eb7b4ad34b335e812fae6dbccc489f48;hp=982236b5fb402f1441d2494d3cdddde5303b3cc7;hpb=bcc1a6ecf1eadcf69dd9efa02fee69ee63949ca0;p=awesomized%2Flibmemcached

diff --git a/test/tests/memcached/touch.cpp b/test/tests/memcached/touch.cpp
index 982236b5..fa865b78 100644
--- a/test/tests/memcached/touch.cpp
+++ b/test/tests/memcached/touch.cpp
@@ -5,11 +5,17 @@ TEST_CASE("memcached_touch") {
   auto test = MemcachedCluster::mixed();
   auto memc = &test.memc;
   memcached_return_t rc;
-  auto binary = GENERATE(0, 1);
+  auto proto = GENERATE(as<memcached_behavior_t>{}, 0, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, MEMCACHED_BEHAVIOR_META_PROTOCOL);
 
-  test.enableBinaryProto(binary);
+  if (proto) {
+    REQUIRE_SUCCESS(memcached_behavior_set(memc, proto, 1));
+  }
+
+  if (proto == MEMCACHED_BEHAVIOR_META_PROTOCOL && !test.isGEVersion(1, 6)) {
+    return;
+  }
 
-  DYNAMIC_SECTION("touch binary=" << binary) {
+  DYNAMIC_SECTION("touch " << (proto ? libmemcached_string_behavior(proto) + sizeof("MEMCACHED_BEHAVIOR") : "ASCII_PROTOCOL")) {
     REQUIRE_FALSE(memcached_get(memc, S(__func__), nullptr, nullptr, &rc));
     REQUIRE_RC(MEMCACHED_NOTFOUND, rc);
 
@@ -30,7 +36,7 @@ TEST_CASE("memcached_touch") {
     REQUIRE_FALSE(*val);
   }
 
-  DYNAMIC_SECTION("touch_by_key binary=" << binary) {
+  DYNAMIC_SECTION("touch_by_key " << (proto ? libmemcached_string_behavior(proto) + sizeof("MEMCACHED_BEHAVIOR") : "ASCII_PROTOCOL")) {
     REQUIRE_RC(MEMCACHED_NOTFOUND, memcached_touch_by_key(memc, S(__func__), S(__func__), 60));
     REQUIRE_SUCCESS(memcached_set_by_key(memc, S(__func__), S(__func__), S(__func__), 2, 0));