X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fsetup_and_teardowns.cc;h=15c7a3e04062d6d8e28d6bea80972f662aab37c8;hb=5c09a7ed2edbb9876493f30d59433331b63f6bfc;hp=06a492529eaf98e063e429f4d70848514176736b;hpb=9ccc920d86467ea463a07fd99e5ef4ea804c7800;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached-1.0/setup_and_teardowns.cc b/tests/libmemcached-1.0/setup_and_teardowns.cc
index 06a49252..15c7a3e0 100644
--- a/tests/libmemcached-1.0/setup_and_teardowns.cc
+++ b/tests/libmemcached-1.0/setup_and_teardowns.cc
@@ -40,27 +40,49 @@
 
 #include <libmemcached/util.h>
 
+#include "tests/print.h"
 #include "tests/libmemcached-1.0/setup_and_teardowns.h"
 
 #include <sys/stat.h>
 
+using namespace libtest;
+
+memcached_return_t return_value_based_on_buffering(memcached_st *memc)
+{
+  if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS))
+  {
+    return MEMCACHED_BUFFERED;
+  }
+
+  return MEMCACHED_SUCCESS;
+}
+
 /**
   @note This should be testing to see if the server really supports the binary protocol.
 */
 test_return_t pre_binary(memcached_st *memc)
 {
+  test_true(memcached_server_count(memc) > 0);
   test_skip(true, libmemcached_util_version_check(memc, 1, 4, 4));
   test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, true));
 
   return TEST_SUCCESS;
 }
 
+test_return_t pre_buffer(memcached_st *memc)
+{
+  test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, true));
+
+  return TEST_SUCCESS;
+}
+
 test_return_t pre_unix_socket(memcached_st *memc)
 {
   struct stat buf;
 
   memcached_servers_reset(memc);
   const char *socket_file= libtest::default_socket();
+  test_skip(true, bool(socket_file));
 
   test_skip(0, stat(socket_file, &buf));
 
@@ -205,30 +227,6 @@ test_return_t pre_nonblock(memcached_st *memc)
   return TEST_SUCCESS;
 }
 
-test_return_t pre_cork(memcached_st *memc)
-{
-#ifdef __APPLE__
-  return TEST_SKIPPED;
-#endif
-  bool set= true;
-  if (memcached_success(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_CORK, set)))
-    return TEST_SUCCESS;
-
-  return TEST_SKIPPED;
-}
-
-test_return_t pre_cork_and_nonblock(memcached_st *memc)
-{
-#ifdef __APPLE__
-  return TEST_SKIPPED;
-#endif
-  test_return_t test_rc;
-  if ((test_rc= pre_cork(memc)) != TEST_SUCCESS)
-    return test_rc;
-
-  return pre_nonblock(memc);
-}
-
 test_return_t pre_nonblock_binary(memcached_st *memc)
 {
   memcached_st *memc_clone= memcached_clone(NULL, memc);