Merged Jean-Charles Redoutey

diff --cc tests/function.c
index 3cf729ba467a9dc59154a8626ca07844d20f73b2,d6822cfc7f5d73fe3e639577496318fb9d95365e..cfdccb28b1284f79918a7df75338341c8f43809f
--- 1/tests/function.c
--- 2/tests/function.c
+++ b/tests/function.c
@@@ -4732,60 -4732,52 +4732,100 @@@ static test_return_t regression_bug_442
    return TEST_SUCCESS;
  }
  
- 
- 
 +/* Test memcached_server_get_last_disconnect
 + * For a working server set, shall be NULL
 + * For a set of non existing server, shall not be NULL
 + */
 +static test_return_t  test_get_last_disconnect(memcached_st *memc)
 +{
 +  memcached_return rc;
 +  memcached_server_st *disconnected_server;
 +
 +  /* With the working set of server */
 +  const char *key= "marmotte";
 +  const char *value= "milka";
 +
 +  rc= memcached_set(memc, key, strlen(key),
 +                    value, strlen(value),
 +                    (time_t)0, (uint32_t)0);
 +  assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED);
 +
 +  disconnected_server = memcached_server_get_last_disconnect(memc);
 +  assert(disconnected_server == NULL);
 +
 +  /* With a non existing server */
 +  memcached_st *mine;
 +  memcached_server_st *servers;
 +
 +  const char *server_list= "localhost:9";
 +
 +  servers= memcached_servers_parse(server_list);
 +  assert(servers);
 +  mine= memcached_create(NULL);
 +  rc= memcached_server_push(mine, servers);
 +  assert(rc == MEMCACHED_SUCCESS);
 +  memcached_server_list_free(servers);
 +  assert(mine);
 +
 +  rc= memcached_set(mine, key, strlen(key),
 +                    value, strlen(value),
 +                    (time_t)0, (uint32_t)0);
 +  assert(rc != MEMCACHED_SUCCESS);
 +
 +  disconnected_server = memcached_server_get_last_disconnect(mine);
 +  assert(disconnected_server != NULL);
 +  assert(disconnected_server->port == 9);
 +  assert(strncmp(disconnected_server->hostname,"localhost",9) == 0);
 +
 +  memcached_quit(mine);
 +  memcached_free(mine);
 +
 +  return TEST_SUCCESS;
 +}
  
+ /*
+  * This tests ensures expected disconnections (for some behavior changes
+  * for instance) do not wrongly increase failure counter
+  */
+ static test_return_t wrong_failure_counter_test(memcached_st *memc)
+ {
+   memcached_return rc;
+ 
+   /* Set value to force connection to the server */
+   const char *key= "marmotte";
+   const char *value= "milka";
+   char *string = NULL;
+   size_t string_length;
+   uint32_t flags;
+ 
+   rc= memcached_set(memc, key, strlen(key),
+                     value, strlen(value),
+                     (time_t)0, (uint32_t)0);
+   assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED);
+ 
+ 
+   /* put failure limit to 1 */
+   rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT, 1);
+   assert(rc == MEMCACHED_SUCCESS);
+   /* Put a retry timeout to effectively activate failure_limit effect */
+   rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, 1);
+   assert(rc == MEMCACHED_SUCCESS);
+   /* change behavior that triggers memcached_quit()*/
+   rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 1);
+   assert(rc == MEMCACHED_SUCCESS);
+ 
+ 
+   /* Check if we still are connected */
+   string= memcached_get(memc, key, strlen(key),
+                         &string_length, &flags, &rc);
+ 
+   assert(rc == MEMCACHED_SUCCESS);
+   assert(string);
+   free(string);
+ 
+   return TEST_SUCCESS;
+ }
  
 -
 -
  test_st udp_setup_server_tests[] ={
    {"set_udp_behavior_test", 0, set_udp_behavior_test},
    {"add_tcp_server_udp_client_test", 0, add_tcp_server_udp_client_test},