X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fall_tests.h;h=bcfc90fc0dad4b14b7cab641e309befc541ffe6c;hb=34c80c4aeca40c4d133c79a0fc3cc378a2d4f511;hp=9f01ae29f1fb51605d42482a17e51193c1fbb4b3;hpb=1e8bc3cb173d8b4e206363de7fdabeddb32d0f53;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached-1.0/all_tests.h b/tests/libmemcached-1.0/all_tests.h
index 9f01ae29..bcfc90fc 100644
--- a/tests/libmemcached-1.0/all_tests.h
+++ b/tests/libmemcached-1.0/all_tests.h
@@ -238,6 +238,7 @@ test_st user_tests[] ={
 };
 
 test_st replication_tests[]= {
+  {"validate replication setup", true, (test_callback_fn*)check_replication_sanity_TEST },
   {"set", true, (test_callback_fn*)replication_set_test },
   {"get", false, (test_callback_fn*)replication_get_test },
   {"mget", false, (test_callback_fn*)replication_mget_test },
@@ -272,6 +273,7 @@ test_st regression_tests[]= {
   {"lp:655423", true, (test_callback_fn*)regression_bug_655423 },
   {"lp:490520", true, (test_callback_fn*)regression_bug_490520 },
   {"lp:854604", true, (test_callback_fn*)regression_bug_854604 },
+  {"lp:996813", true, (test_callback_fn*)regression_996813_TEST },
   {0, false, (test_callback_fn*)0}
 };
 
@@ -282,12 +284,14 @@ test_st ketama_compatibility[]= {
 };
 
 test_st generate_tests[] ={
-  {"generate_pairs", true, (test_callback_fn*)generate_pairs },
   {"generate_data", true, (test_callback_fn*)generate_data },
   {"get_read", false, (test_callback_fn*)get_read },
   {"delete_generate", false, (test_callback_fn*)delete_generate },
-  {"generate_buffer_data", true, (test_callback_fn*)generate_buffer_data },
-  {"delete_buffer", false, (test_callback_fn*)delete_buffer_generate},
+  {"cleanup", true, (test_callback_fn*)cleanup_pairs },
+  {0, 0, (test_callback_fn*)0}
+};
+  // New start
+test_st generate_mget_TESTS[] ={
   {"generate_data", true, (test_callback_fn*)generate_data },
   {"mget_read", false, (test_callback_fn*)mget_read },
   {"mget_read_result", false, (test_callback_fn*)mget_read_result },
@@ -295,15 +299,16 @@ test_st generate_tests[] ={
   {"memcached_fetch_result() partial read", false, (test_callback_fn*)mget_read_partial_result },
   {"mget_read_function", false, (test_callback_fn*)mget_read_function },
   {"cleanup", true, (test_callback_fn*)cleanup_pairs },
+  {0, 0, (test_callback_fn*)0}
+};
+
+test_st generate_large_TESTS[] ={
   {"generate_large_pairs", true, (test_callback_fn*)generate_large_pairs },
-  {"generate_data", true, (test_callback_fn*)generate_data },
-  {"generate_buffer_data", true, (test_callback_fn*)generate_buffer_data },
   {"cleanup", true, (test_callback_fn*)cleanup_pairs },
   {0, 0, (test_callback_fn*)0}
 };
 
 test_st consistent_tests[] ={
-  {"generate_pairs", true, (test_callback_fn*)generate_pairs },
   {"generate_data", true, (test_callback_fn*)generate_data },
   {"get_read", 0, (test_callback_fn*)get_read_count },
   {"cleanup", true, (test_callback_fn*)cleanup_pairs },
@@ -311,7 +316,6 @@ test_st consistent_tests[] ={
 };
 
 test_st consistent_weighted_tests[] ={
-  {"generate_pairs", true, (test_callback_fn*)generate_pairs },
   {"generate_data", true, (test_callback_fn*)generate_data_with_stats },
   {"get_read", false, (test_callback_fn*)get_read_count },
   {"cleanup", true, (test_callback_fn*)cleanup_pairs },
@@ -414,6 +418,7 @@ test_st memcached_set_encoding_key_TESTS[] ={
   {"memcached_set_encoding_key() +increment_with_initial()", true, (test_callback_fn*)memcached_set_encoding_key_increment_with_initial_TEST },
   {"memcached_set_encoding_key() +decrement_with_initial()", true, (test_callback_fn*)memcached_set_encoding_key_decrement_with_initial_TEST },
   {"memcached_set_encoding_key() +set() +get() +cloen()", true, (test_callback_fn*)memcached_set_encoding_key_set_get_clone_TEST },
+  {"memcached_set_encoding_key() +set() +get() increase value size", true, (test_callback_fn*)memcached_set_encoding_key_set_grow_key_TEST },
   {0, 0, (test_callback_fn*)0}
 };
 
@@ -467,6 +472,9 @@ collection_st collection[] ={
   {"Cal Haldenbrand's tests", 0, 0, haldenbrand_TESTS},
   {"user written tests", 0, 0, user_tests},
   {"generate", 0, 0, generate_tests},
+  {"generate MEMCACHED_BEHAVIOR_BUFFER_REQUESTS", (test_callback_fn*)pre_buffer, 0, generate_tests},
+  {"mget generate MEMCACHED_BEHAVIOR_BUFFER_REQUESTS", (test_callback_fn*)pre_buffer, 0, generate_mget_TESTS},
+  {"generate large", 0, 0, generate_large_TESTS},
   {"generate_hsieh", (test_callback_fn*)pre_hsieh, 0, generate_tests},
   {"generate_ketama", (test_callback_fn*)pre_behavior_ketama, 0, generate_tests},
   {"generate_hsieh_consistent", (test_callback_fn*)enable_consistent_hsieh, 0, generate_tests},
@@ -474,9 +482,7 @@ collection_st collection[] ={
   {"generate_murmur", (test_callback_fn*)pre_murmur, 0, generate_tests},
   {"generate_jenkins", (test_callback_fn*)pre_jenkins, 0, generate_tests},
   {"generate_nonblock", (test_callback_fn*)pre_nonblock, 0, generate_tests},
-  // Too slow
-  {"generate_corked", (test_callback_fn*)pre_cork, 0, generate_tests},
-  {"generate_corked_and_nonblock", (test_callback_fn*)pre_cork_and_nonblock, 0, generate_tests},
+  {"mget generate_nonblock", (test_callback_fn*)pre_nonblock, 0, generate_mget_TESTS},
   {"consistent_not", 0, 0, consistent_tests},
   {"consistent_ketama", (test_callback_fn*)pre_behavior_ketama, 0, consistent_tests},
   {"consistent_ketama_weighted", (test_callback_fn*)pre_behavior_ketama_weighted, 0, consistent_weighted_tests},