flush

[m6w6/libmemcached] / tests / libmemcached-1.0 / server_add.cc

diff --git a/tests/libmemcached-1.0/server_add.cc b/tests/libmemcached-1.0/server_add.cc
index 495a7717152661c02c6f57f28f3e3f8adabc915f..3b42e980b6bd9c5c30a07413b6f9d96bb76cc852 100644 (file)
--- a/tests/libmemcached-1.0/server_add.cc
+++ b/tests/libmemcached-1.0/server_add.cc
@@ -35,16 +35,16 @@
  *
  */
 
-#include <mem_config.h>
-#include <libtest/yatl.h>
+#include "mem_config.h"
+#include "libtest/yatl.h"
 
 #include <string>
 
 using namespace libtest;
 
-#include <libmemcached-1.0/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
-#include <tests/server_add.h>
+#include "tests/server_add.h"
 
 static std::string random_hostname()
 {
@@ -90,7 +90,6 @@ test_return_t memcached_server_many_TEST(memcached_st* memc)
 
 test_return_t memcached_server_many_weighted_TEST(memcached_st* memc)
 {
-  SKIP_IF(true);
   ASSERT_EQ(0, memcached_server_count(memc));
 
   in_port_t base_port= 5555;
@@ -98,8 +97,22 @@ test_return_t memcached_server_many_weighted_TEST(memcached_st* memc)
   {
     std::string hostname(random_hostname());
     ASSERT_TRUE(hostname.size());
-    test_compare(MEMCACHED_SUCCESS, memcached_server_add_with_weight(memc, hostname.c_str(), base_port +x, random() % 10));
+    test_compare(MEMCACHED_SUCCESS, memcached_server_add_with_weight(memc, hostname.c_str(), base_port +x, x % 10));
   }
 
   return TEST_SUCCESS;
 }
+
+test_return_t memcached_servers_reset_test(memcached_st* memc)
+{
+  ASSERT_EQ(0, memcached_server_count(memc));
+
+  test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, "localhost", 11511));
+
+  memcached_servers_reset(memc);
+
+  test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, "localhost", 11511));
+
+  return TEST_SUCCESS;
+}
+