tests: fix skip condition for CAS 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 0d6d047db6823d166700e2fce474914fc8eda2ec..d799f4f6340fc9496bb22d6953c550116666f7e4 100644 (file)
--- a/tests/libmemcached-1.0/mem_functions.cc
+++ b/tests/libmemcached-1.0/mem_functions.cc
@@ -717,7 +717,7 @@ test_return_t cas_test(memcached_st *memc)
 
   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,
@@ -4848,7 +4848,7 @@ test_return_t regression_bug_1251482(memcached_st*)
 
   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;
@@ -4858,7 +4858,11 @@ test_return_t regression_bug_1251482(memcached_st*)
 
     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;