Remove final flush logic

diff --git a/libtest/framework.cc b/libtest/framework.cc
index 8e049e60cfa8acc1bb649c34d9bc95aac0377a2f..73e227e429be74b9788a7db0af3248eb28e3f1b0 100644 (file)
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -26,10 +26,8 @@
 
 using namespace libtest;
 
-static test_return_t _default_callback(void *p)
+static test_return_t _default_callback(void*)
 {
-  (void)p;
-
   return TEST_SUCCESS;
 }
 

diff --git a/tests/failure.cc b/tests/failure.cc
index 073cd17b862d0b595c451b01ecec4f77112cb86c..923cdf3878e63e3a44e85f493516f80ffde3e43f 100644 (file)
--- a/tests/failure.cc
+++ b/tests/failure.cc
@@ -219,7 +219,6 @@ void get_world(Framework *world)
   world->_destroy= (test_callback_destroy_fn*)world_destroy;
 
   world->item._startup= (test_callback_fn*)world_test_startup;
-  world->item.set_flush((test_callback_fn*)world_flush);
   world->_on_error= (test_callback_error_fn*)world_on_error;
 
   world->collection_startup= (test_callback_fn*)world_container_startup;

diff --git a/tests/include.am b/tests/include.am
index ff5223fe09df1392eb04fe6f3cf443fcef323f0f..9e87ca17b2e297e21f31480156bd97982709def4 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -18,7 +18,6 @@ DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
 
 EXTRA_DIST+= tests/cpp_example.cc
-EXTRA_DIST+= tests/output_plus.res
 
 noinst_HEADERS+= tests/exist.h
 noinst_HEADERS+= tests/keys.hpp

diff --git a/tests/libmemcached-1.0/all_tests.cc b/tests/libmemcached-1.0/all_tests.cc
index 74c195d24825707b583b2b5a6f1a1352de76d665..a3615a81a2bb500dad7cd567f913a652bee79ca9 100644 (file)
--- a/tests/libmemcached-1.0/all_tests.cc
+++ b/tests/libmemcached-1.0/all_tests.cc
@@ -88,7 +88,6 @@ void get_world(Framework *world)
   world->_destroy= (test_callback_destroy_fn*)world_destroy;
 
   world->item._startup= (test_callback_fn*)world_test_startup;
-  world->item.set_flush((test_callback_fn*)world_flush);
   world->_on_error= (test_callback_error_fn*)world_on_error;
 
   world->collection_startup= (test_callback_fn*)world_container_startup;

diff --git a/tests/libmemcached-1.0/all_tests_socket.cc b/tests/libmemcached-1.0/all_tests_socket.cc
index 046bd2906d5b797ee6b8eb6830c75eb3f25aa51a..6037abe1120cd838a57045a166f9bffb23c13ff4 100644 (file)
--- a/tests/libmemcached-1.0/all_tests_socket.cc
+++ b/tests/libmemcached-1.0/all_tests_socket.cc
@@ -77,7 +77,6 @@ void get_world(Framework *world)
   world->_destroy= (test_callback_destroy_fn*)world_destroy;
 
   world->item._startup= (test_callback_fn*)world_test_startup;
-  world->item.set_flush((test_callback_fn*)world_flush);
   world->_on_error= (test_callback_error_fn*)world_on_error;
 
   world->collection_startup= (test_callback_fn*)world_container_startup;

diff --git a/tests/libmemcached-1.0/atomsmasher.cc b/tests/libmemcached-1.0/atomsmasher.cc
index 2b7e9c12a4ab28bccd30e83b231c3e5075ee395a..7ca5cbd498374fdf57fb5a32469d6197ab77c9a2 100644 (file)
--- a/tests/libmemcached-1.0/atomsmasher.cc
+++ b/tests/libmemcached-1.0/atomsmasher.cc
@@ -285,7 +285,6 @@ void get_world(Framework *world)
   world->_destroy= (test_callback_destroy_fn*)world_destroy;
 
   world->item._startup= (test_callback_fn*)world_test_startup;
-  world->item._flush= (test_callback_fn*)world_flush;
   world->_on_error= (test_callback_error_fn*)world_on_error;
 
   world->collection_startup= (test_callback_fn*)world_container_startup;

diff --git a/tests/libmemcached-1.0/generate.cc b/tests/libmemcached-1.0/generate.cc
index 9f6775843894c11269ed4e88d8e7a9ef7d7f9a83..419d1ca273594b5e4e68fe06b1f141cb0e44ecd9 100644 (file)
--- a/tests/libmemcached-1.0/generate.cc
+++ b/tests/libmemcached-1.0/generate.cc
@@ -94,7 +94,7 @@ test_return_t generate_large_pairs(memcached_st *memc)
   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");
+  test_true(check_execute > (global_count / 2));
 
   return TEST_SUCCESS;
 }
@@ -105,7 +105,8 @@ test_return_t generate_data(memcached_st *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");
+  test_true_hint(check_execute > (global_count / 2),
+                 "Possible false, positive, memcached may have ejected key/value based on memory needs");
 
   return TEST_SUCCESS;
 }
@@ -203,7 +204,8 @@ test_return_t get_read(memcached_st *memc)
       free(return_value);
     }
   }
-  test_compare_warn_hint(global_count, keys_returned, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+  test_true_hint(keys_returned > (global_count / 2),
+                 "Possible false, positive, memcached may have ejected key/value based on memory needs");
 
   return TEST_SUCCESS;
 }
@@ -220,8 +222,7 @@ test_return_t mget_read(memcached_st *memc)
   {
     unsigned int keys_returned;
     test_compare(TEST_SUCCESS, fetch_all_results(memc, keys_returned));
-    test_true(keys_returned > 0);
-    test_compare_warn_hint(global_count, keys_returned, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+    test_true(keys_returned > (global_count / 2));
   }
 
   return TEST_SUCCESS;
@@ -329,7 +330,8 @@ test_return_t delete_generate(memcached_st *memc)
       total++;
     }
   }
-  test_compare_warn_hint(global_count, total, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+  test_true_hint(total > (global_count / 2),
+                 "Possible false, positive, memcached may have ejected key/value based on memory needs");
 
   return TEST_SUCCESS;
 }
@@ -346,7 +348,9 @@ test_return_t delete_buffer_generate(memcached_st *memc)
       total++;
     }
   }
-  test_compare_warn_hint(global_count, total, "Possible false, positive, memcached may have ejected key/value based on memory needs");
+
+  test_true_hint(total > (global_count / 2),
+                 "Possible false, positive, memcached may have ejected key/value based on memory needs");
 
   return TEST_SUCCESS;
 }

diff --git a/tests/libmemcached-1.0/plus.cpp b/tests/libmemcached-1.0/plus.cpp
index bd19feb0471c762846f5410be6f135d6e33d2592..d2f89053d934d50e90e912d2fd36d3c90c931437 100644 (file)
--- a/tests/libmemcached-1.0/plus.cpp
+++ b/tests/libmemcached-1.0/plus.cpp
@@ -292,7 +292,6 @@ void get_world(Framework *world)
   world->_destroy= world_destroy;
 
   world->item._startup= reinterpret_cast<test_callback_fn*>(world_test_startup);
-  world->item._flush= reinterpret_cast<test_callback_fn*>(world_flush);
   world->_on_error= reinterpret_cast<test_callback_error_fn*>(world_on_error);
 
   world->collection_startup= reinterpret_cast<test_callback_fn*>(world_container_startup);

diff --git a/tests/libmemcached-1.0/sasl.cc b/tests/libmemcached-1.0/sasl.cc
index ee421300b0b3060326b69d52324e773b08f2a74f..3a4dfdf1d3535aba4d26753ea414df4d6ced38d8 100644 (file)
--- a/tests/libmemcached-1.0/sasl.cc
+++ b/tests/libmemcached-1.0/sasl.cc
@@ -107,7 +107,6 @@ void get_world(Framework *world)
   world->_destroy= (test_callback_destroy_fn*)world_destroy;
 
   world->item._startup= (test_callback_fn*)world_test_startup;
-  world->item.set_flush((test_callback_fn*)world_flush);
   world->_on_error= (test_callback_error_fn*)world_on_error;
 
   world->collection_startup= (test_callback_fn*)world_container_startup;

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index ded47ada1ed66fb604a1ca2ccdde017101cab44c..2d05a5d596e78d6a40ddabd874666c3d79843c7e 100644 (file)
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -150,16 +150,6 @@ static test_return_t world_test_startup(libmemcached_test_container_st *containe
   return TEST_SUCCESS;
 }
 
-test_return_t world_flush(libmemcached_test_container_st *container);
-test_return_t world_flush(libmemcached_test_container_st *container)
-{
-  test_true(container->memc);
-  memcached_flush(container->memc, 0);
-  memcached_quit(container->memc);
-
-  return TEST_SUCCESS;
-}
-
 static test_return_t world_on_error(test_return_t , libmemcached_test_container_st *container)
 {
   test_true(container->memc);

diff --git a/tests/libmemcached_world_socket.h b/tests/libmemcached_world_socket.h
index 4080a1b075d275a646ae86e0566ba6d73416ad2b..cda999516934c7b50873fe5c4a9b65f38f011248 100644 (file)
--- a/tests/libmemcached_world_socket.h
+++ b/tests/libmemcached_world_socket.h
@@ -131,16 +131,6 @@ static test_return_t world_test_startup(libmemcached_test_container_st *containe
   return TEST_SUCCESS;
 }
 
-test_return_t world_flush(libmemcached_test_container_st *container);
-test_return_t world_flush(libmemcached_test_container_st *container)
-{
-  test_true(container->memc);
-  memcached_flush(container->memc, 0);
-  memcached_quit(container->memc);
-
-  return TEST_SUCCESS;
-}
-
 static test_return_t world_on_error(test_return_t , libmemcached_test_container_st *container)
 {
   test_true(container->memc);

diff --git a/tests/mem_udp.cc b/tests/mem_udp.cc
index 17f9f55f3a515bdd89411f580eeec83720c849c1..a07d4166c44915d8866dd56f688830a6a4951291 100644 (file)
--- a/tests/mem_udp.cc
+++ b/tests/mem_udp.cc
@@ -572,7 +572,6 @@ void get_world(Framework *world)
   world->_destroy= (test_callback_destroy_fn*)world_destroy;
 
   world->item._startup= (test_callback_fn*)world_test_startup;
-  world->item._flush= (test_callback_fn*)world_flush;
   world->_on_error= (test_callback_error_fn*)world_on_error;
 
   world->collection_startup= (test_callback_fn*)world_container_startup;