Fix for bug in server for touch

[awesomized/libmemcached] / tests / libmemcached-1.0 / all_tests.h

diff --git a/tests/libmemcached-1.0/all_tests.h b/tests/libmemcached-1.0/all_tests.h
index 2da9c7e314b0ad127bf633f0667e15fe7004f7a3..fe28e73318a8d441ac8b8c0adf89985ab783ea6f 100644 (file)
--- a/tests/libmemcached-1.0/all_tests.h
+++ b/tests/libmemcached-1.0/all_tests.h
@@ -346,6 +346,7 @@ test_st hash_sanity[] ={
 #endif
 
 test_st ketama_auto_eject_hosts[] ={
+  {"basic ketama test", true, (test_callback_fn*)ketama_TEST },
   {"auto_eject_hosts", true, (test_callback_fn*)auto_eject_hosts },
   {"output_ketama_weighted_keys", true, (test_callback_fn*)output_ketama_weighted_keys },
   {0, 0, (test_callback_fn*)0}
@@ -402,9 +403,11 @@ test_st virtual_bucket_tests[] ={
   {0, 0, (test_callback_fn*)0}
 };
 
-test_st memcached_server_add_tests[] ={
+test_st memcached_server_add_TESTS[] ={
   {"memcached_server_add(\"\")", false, (test_callback_fn*)memcached_server_add_empty_test },
   {"memcached_server_add(NULL)", false, (test_callback_fn*)memcached_server_add_null_test },
+  {"memcached_server_add(many)", false, (test_callback_fn*)memcached_server_many_TEST },
+  {"memcached_server_add(many weighted)", false, (test_callback_fn*)memcached_server_many_weighted_TEST },
   {0, 0, (test_callback_fn*)0}
 };
 
@@ -443,7 +446,9 @@ collection_st collection[] ={
   {"basic", 0, 0, basic_tests},
   {"hsieh_availability", 0, 0, hsieh_availability},
   {"murmur_availability", 0, 0, murmur_availability},
-  {"memcached_server_add", 0, 0, memcached_server_add_tests},
+  {"memcached_server_add", (test_callback_fn*)memcached_servers_reset_SETUP, 0, memcached_server_add_TESTS},
+  {"memcached_server_add(MEMCACHED_DISTRIBUTION_CONSISTENT)", (test_callback_fn*)memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_SETUP, 0, memcached_server_add_TESTS},
+  {"memcached_server_add(MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED)", (test_callback_fn*)memcached_servers_reset_MEMCACHED_DISTRIBUTION_CONSISTENT_WEIGHTED_SETUP, 0, memcached_server_add_TESTS},
   {"block", 0, 0, tests},
   {"binary", (test_callback_fn*)pre_binary, 0, tests},
   {"nonblock", (test_callback_fn*)pre_nonblock, 0, tests},