X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ffunction.c;h=1cfd96a4f32660e8d4e3e4f18ffe4380881162f4;hb=6f42f1c77da54da0b19274cc0d6b6c9745e40de0;hp=b0fc1fd871d3cab8a9e168d4f7adf7a0aa088d88;hpb=908460d7e36814d3c6774da16fcb0891165a93d3;p=awesomized%2Flibmemcached

diff --git a/tests/function.c b/tests/function.c
index b0fc1fd8..1cfd96a4 100644
--- a/tests/function.c
+++ b/tests/function.c
@@ -504,7 +504,7 @@ test_return add_test(memcached_st *memc)
   if (setting_value)
     assert(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_STORED);
   else
-    assert(rc == MEMCACHED_NOTSTORED);
+    assert(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_DATA_EXISTS);
 
   return 0;
 }
@@ -630,6 +630,16 @@ test_return bad_key_test(memcached_st *memc)
     assert(rc == MEMCACHED_BAD_KEY_PROVIDED);
   }
 
+  /* Make sure zero length keys are marked as bad */
+  set= 1;
+  rc= memcached_behavior_set(clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set);
+  assert(rc == MEMCACHED_SUCCESS);
+  string= memcached_get(clone, key, 0,
+                        &string_length, &flags, &rc);
+  assert(rc == MEMCACHED_BAD_KEY_PROVIDED);
+  assert(string_length ==  0);
+  assert(!string);
+
   memcached_free(clone);
 
   return 0;
@@ -2584,6 +2594,19 @@ memcached_return pre_behavior_ketama_weighted(memcached_st *memc)
   assert(value == MEMCACHED_HASH_MD5);
   return MEMCACHED_SUCCESS;
 }
+
+memcached_return pre_binary(memcached_st *memc)
+{
+  memcached_return rc;
+
+  rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1);
+  assert(rc == MEMCACHED_SUCCESS);
+
+  assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1);
+
+  return MEMCACHED_SUCCESS;
+
+}
 void my_free(memcached_st *ptr, void *mem)
 {
   free(mem);
@@ -2726,8 +2749,8 @@ memcached_return enable_cas(memcached_st *memc)
   memcached_version(memc);
 
   if (memc->hosts[0].major_version >= 1 &&
-      memc->hosts[0].minor_version >= 2 &&
-      memc->hosts[0].micro_version >= 4)
+      (memc->hosts[0].minor_version == 2 && 
+       memc->hosts[0].micro_version >= 4) || memc->hosts[0].minor_version > 2)
   {
     memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set);
 
@@ -2742,8 +2765,8 @@ memcached_return check_for_1_2_3(memcached_st *memc)
   memcached_version(memc);
 
   if (memc->hosts[0].major_version >= 1 &&
-      memc->hosts[0].minor_version >= 2 &&
-      memc->hosts[0].micro_version >= 4)
+      (memc->hosts[0].minor_version == 2 && memc->hosts[0].micro_version >= 4) 
+      || memc->hosts[0].minor_version > 2)
     return MEMCACHED_SUCCESS;
 
   return MEMCACHED_FAILURE;
@@ -2790,6 +2813,14 @@ memcached_return pre_nodelay(memcached_st *memc)
   return MEMCACHED_SUCCESS;
 }
 
+memcached_return pre_settimer(memcached_st *memc)
+{
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SND_TIMEOUT, 1000);
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RCV_TIMEOUT, 1000);
+
+  return MEMCACHED_SUCCESS;
+}
+
 memcached_return poll_timeout(memcached_st *memc)
 {
   int32_t timeout;
@@ -2936,8 +2967,10 @@ test_st consistent_weighted_tests[] ={
 
 collection_st collection[] ={
   {"block", 0, 0, tests},
+//  {"binary", pre_binary, 0, tests},
   {"nonblock", pre_nonblock, 0, tests},
   {"nodelay", pre_nodelay, 0, tests},
+  {"settimer", pre_settimer, 0, tests},
   {"md5", pre_md5, 0, tests},
   {"crc", pre_crc, 0, tests},
   {"hsieh", pre_hsieh, 0, tests},