X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fparser.cc;h=d2be9a17208c044d4c67e89c8315e39349634ee7;hb=1f483f29cd415fdb749a5571d9e1483dd11a2ab0;hp=2e8e5cd6464b70b01ffd82eb455ff9071f186777;hpb=7acbb1495e0aaa29df7ffb09b90ec97fc949c48d;p=awesomized%2Flibmemcached

diff --git a/tests/libmemcached-1.0/parser.cc b/tests/libmemcached-1.0/parser.cc
index 2e8e5cd6..d2be9a17 100644
--- a/tests/libmemcached-1.0/parser.cc
+++ b/tests/libmemcached-1.0/parser.cc
@@ -85,7 +85,7 @@ struct scanner_variable_t {
 // Check and make sure the first host is what we expect it to be
 static test_return_t __check_host(memcached_st *memc, const scanner_string_st &hostname)
 {
-  memcached_server_instance_st instance=
+  const memcached_instance_st * instance=
     memcached_server_instance_by_position(memc, 0);
 
   test_true(instance);
@@ -617,7 +617,7 @@ test_return_t random_statement_build_test(memcached_st*)
 }
 
 static memcached_return_t dump_server_information(const memcached_st *,
-                                                  memcached_server_instance_st instance,
+                                                  const memcached_instance_st * instance,
                                                   void *)
 {
   if (strcmp(memcached_server_name(instance), "localhost")) 
@@ -667,7 +667,7 @@ struct socket_weight_t {
 };
 
 static memcached_return_t dump_socket_information(const memcached_st *,
-                                                  memcached_server_instance_st instance,
+                                                  const memcached_instance_st * instance,
                                                   void *context)
 {
   socket_weight_t *check= (socket_weight_t *)context;
@@ -737,9 +737,6 @@ test_return_t test_parse_socket(memcached_st *)
 */
 test_return_t regression_bug_71231153_connect(memcached_st *)
 {
-  if (libmemcached_util_ping("10.0.2.252", 0, NULL)) // If for whatever reason someone has a host at this address, skip
-    return TEST_SKIPPED;
-
   { // Test the connect-timeout, on a bad host we should get MEMCACHED_CONNECTION_FAILURE
     memcached_st *memc= memcached(test_literal_param("--SERVER=10.0.2.252 --CONNECT-TIMEOUT=0"));
     test_true(memc);
@@ -761,11 +758,6 @@ test_return_t regression_bug_71231153_connect(memcached_st *)
 
 test_return_t regression_bug_71231153_poll(memcached_st *)
 {
-  if (libmemcached_util_ping("10.0.2.252", 0, NULL)) // If for whatever reason someone has a host at this address, skip
-  {
-    return TEST_SKIPPED;
-  }
-
   { // Test the poll timeout, on a bad host we should get MEMCACHED_CONNECTION_FAILURE
     memcached_st *memc= memcached(test_literal_param("--SERVER=10.0.2.252 --POLL-TIMEOUT=0"));
     test_true(memc);