Merge in fixes for deprecated bits in behavior.

[awesomized/libmemcached] / tests / parser.cc

diff --git a/tests/parser.cc b/tests/parser.cc
index 40904a085ce3fb435205782eb3288401071a04df..0a46618926200e234a3a827a838d99c7bb32bde3 100644 (file)
--- a/tests/parser.cc
+++ b/tests/parser.cc
@@ -1,6 +1,6 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  * 
- *  Gearmand client and server library.
+ *  Libmemcached Client and Server 
  *
  *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
  *  All rights reserved.
@@ -125,13 +125,6 @@ static test_return_t __check_AUTO_EJECT_HOSTS(memcached_st *memc, const scanner_
   return TEST_SUCCESS;
 }
 
-static test_return_t __check_CACHE_LOOKUPS(memcached_st *memc, const scanner_string_st &value)
-{
-  (void)value;
-  test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_CACHE_LOOKUPS));
-  return TEST_SUCCESS;
-}
-
 static test_return_t __check_NOREPLY(memcached_st *memc, const scanner_string_st &value)
 {
   (void)value;
@@ -201,12 +194,7 @@ scanner_variable_t test_boolean_options[]= {
   { ARRAY,  make_scanner_string("--AUTO_EJECT_HOSTS"), scanner_string_null, __check_AUTO_EJECT_HOSTS },
   { ARRAY,  make_scanner_string("--BINARY_PROTOCOL"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--BUFFER_REQUESTS"), scanner_string_null, NULL },
-  { ARRAY,  make_scanner_string("--CACHE_LOOKUPS"), scanner_string_null, __check_CACHE_LOOKUPS },
-#if 0 // Not all platforms support
-  { ARRAY,  make_scanner_string("--CORK"), scanner_string_null, NULL },
-#endif
   { ARRAY,  make_scanner_string("--HASH_WITH_PREFIX_KEY"), scanner_string_null, NULL },
-  { ARRAY,  make_scanner_string("--KETAMA"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--KETAMA_WEIGHTED"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--NOREPLY"), scanner_string_null, __check_NOREPLY },
   { ARRAY,  make_scanner_string("--RANDOMIZE_REPLICA_READ"), scanner_string_null, NULL },
@@ -229,6 +217,8 @@ scanner_variable_t prefix_key_strings[]= {
 
 scanner_variable_t distribution_strings[]= {
   { ARRAY,  make_scanner_string("--DISTRIBUTION=consistent"), scanner_string_null, NULL },
+  { ARRAY,  make_scanner_string("--DISTRIBUTION=consistent,CRC"), scanner_string_null, NULL },
+  { ARRAY,  make_scanner_string("--DISTRIBUTION=consistent,MD5"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--DISTRIBUTION=random"), scanner_string_null, __check_distribution_RANDOM },
   { ARRAY,  make_scanner_string("--DISTRIBUTION=modula"), scanner_string_null, NULL },
   { NIL, scanner_string_null, scanner_string_null, NULL}