Fixed udp warnings.

[awesomized/libmemcached] / tests / function.c

diff --git a/tests/function.c b/tests/function.c
index e37aabef4e488cd61faac157f58bcc6cb2978b47..dfb47b4e26cc7279211bd5eeabd49d7e6cdc656c 100644 (file)
--- a/tests/function.c
+++ b/tests/function.c
@@ -1306,8 +1306,8 @@ test_return callback_test(memcached_st *memc)
 /* We don't test the behavior itself, we test the switches */
 test_return behavior_test(memcached_st *memc)
 {
-  unsigned long long value;
-  unsigned int set= 1;
+  uint64_t value;
+  uint32_t set= 1;
 
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, set);
   value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK);
@@ -2109,6 +2109,7 @@ test_return user_supplied_bug17(memcached_st *memc)
     assert(length==strlen(value));
     assert(rc == MEMCACHED_SUCCESS);
     assert(memcmp(value, value2, length)==0);
+    free(value2);
 
     return 0;
 }
@@ -2277,18 +2278,22 @@ test_return generate_data(memcached_st *memc)
 
 test_return generate_data_with_stats(memcached_st *memc)
 {
-  memcached_stat_st *stat_p= NULL;
+  memcached_stat_st *stat_p;
   memcached_return rc;
-  int host_index= 0;
+  uint32_t host_index= 0;
   execute_set(memc, global_pairs, global_count);
 
   //TODO: hosts used size stats
-  stat_p = memcached_stat(memc, NULL, &rc);
-  for (host_index = 0; host_index < SERVERS_TO_CREATE; ++host_index)
+  stat_p= memcached_stat(memc, NULL, &rc);
+  assert(stat_p);
+
+  for (host_index= 0; host_index < SERVERS_TO_CREATE; host_index++)
   {
-      printf("\nserver %d|%s|%d bytes: %lld\n", host_index, (memc->hosts)[host_index].hostname, (memc->hosts)[host_index].port, (stat_p + host_index)->bytes);
+      printf("\nserver %u|%s|%u bytes: %llu\n", host_index, (memc->hosts)[host_index].hostname, (memc->hosts)[host_index].port, (unsigned long long)(stat_p + host_index)->bytes);
   }
 
+  memcached_stat_free(NULL, stat_p);
+
 
   return 0;
 }
@@ -2597,16 +2602,26 @@ memcached_return pre_behavior_ketama_weighted(memcached_st *memc)
 
 memcached_return pre_binary(memcached_st *memc)
 {
-  memcached_return rc;
-
-  rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1);
-  assert(rc == MEMCACHED_SUCCESS);
+  memcached_return rc= MEMCACHED_FAILURE;
+  memcached_st *clone;
 
-  assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1);
+  clone= memcached_clone(NULL, memc);
+  assert(clone);
+  // The memcached_version needs to be done on a clone, because the server
+  // will not toggle protocol on an connection.
+  memcached_version(clone);
 
-  return MEMCACHED_SUCCESS;
+  if (clone->hosts[0].major_version >= 1 && clone->hosts[0].minor_version > 2) 
+  {
+    rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1);
+    assert(rc == MEMCACHED_SUCCESS);
+    assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1);
+  }
 
+  memcached_free(clone);
+  return rc;
 }
+
 void my_free(memcached_st *ptr, void *mem)
 {
   free(mem);
@@ -2748,9 +2763,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)
+  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)
   {
     memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set);
 
@@ -2764,8 +2778,7 @@ 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) 
+  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)
     return MEMCACHED_SUCCESS;
 
@@ -2813,6 +2826,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;
@@ -2962,6 +2983,7 @@ collection_st collection[] ={
   {"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},