Breakup generate tests.

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

diff --git a/tests/libmemcached-1.0/generate.cc b/tests/libmemcached-1.0/generate.cc
index 4411d77f22129ed07e8bef1accd197b186c7b4c7..79caa5fb40410ee52ca6d2c34ef79500ba25e30b 100644 (file)
--- a/tests/libmemcached-1.0/generate.cc
+++ b/tests/libmemcached-1.0/generate.cc
@@ -51,6 +51,8 @@
 #define GLOBAL_COUNT 10000
 #define GLOBAL2_COUNT 100
 
+using namespace libtest;
+
 static pairs_st *global_pairs;
 static const char *global_keys[GLOBAL_COUNT];
 static size_t global_keys_length[GLOBAL_COUNT];
@@ -64,7 +66,7 @@ test_return_t cleanup_pairs(memcached_st *memc)
   return TEST_SUCCESS;
 }
 
-test_return_t generate_pairs(memcached_st *)
+static test_return_t generate_pairs(memcached_st *)
 {
   global_pairs= pairs_generate(GLOBAL_COUNT, 400);
   global_count= GLOBAL_COUNT;
@@ -78,7 +80,7 @@ test_return_t generate_pairs(memcached_st *)
   return TEST_SUCCESS;
 }
 
-test_return_t generate_large_pairs(memcached_st *)
+test_return_t generate_large_pairs(memcached_st *memc)
 {
   global_pairs= pairs_generate(GLOBAL2_COUNT, MEMCACHED_MAX_BUFFER+10);
   global_count= GLOBAL2_COUNT;
@@ -89,11 +91,18 @@ test_return_t generate_large_pairs(memcached_st *)
     global_keys_length[x]=  global_pairs[x].key_length;
   }
 
+  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, true);
+  unsigned int check_execute= execute_set(memc, global_pairs, global_count);
+
+  test_compare_warn_hint(global_count, check_execute, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+
   return TEST_SUCCESS;
 }
 
 test_return_t generate_data(memcached_st *memc)
 {
+  test_compare(TEST_SUCCESS, generate_pairs(memc));
+
   unsigned int check_execute= execute_set(memc, global_pairs, global_count);
 
   test_compare_warn_hint(global_count, check_execute, "Possible false, positive, memcached may have ejected key/value based on memory needs");
@@ -103,6 +112,8 @@ test_return_t generate_data(memcached_st *memc)
 
 test_return_t generate_data_with_stats(memcached_st *memc)
 {
+  test_compare(TEST_SUCCESS, generate_pairs(memc));
+
   unsigned int check_execute= execute_set(memc, global_pairs, global_count);
 
   test_compare(check_execute, global_count);