Add Gitter badge

[awesomized/libmemcached] / tests / libmemcached-1.0 / parser.cc

diff --git a/tests/libmemcached-1.0/parser.cc b/tests/libmemcached-1.0/parser.cc
index 7e48760e77d9204ac34bb2626b835876ec96c487..b5204a83a712d5c8d7f471c5f2bc84f4c3fa6e12 100644 (file)
--- a/tests/libmemcached-1.0/parser.cc
+++ b/tests/libmemcached-1.0/parser.cc
@@ -35,8 +35,8 @@
  *
  */
 
-#include <mem_config.h>
-#include <libtest/test.hpp>
+#include "mem_config.h"
+#include "libtest/test.hpp"
 
 using namespace libtest;
 
@@ -44,11 +44,11 @@ using namespace libtest;
 #include <string>
 #include <cerrno>
 
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
+#include "libmemcached-1.0/memcached.h"
+#include "libmemcachedutil-1.0/util.h"
 
-#include <tests/libmemcached-1.0/parser.h>
-#include <tests/print.h>
+#include "tests/libmemcached-1.0/parser.h"
+#include "tests/print.h"
 #include "libmemcached/instance.hpp"
 
 enum scanner_type_t
@@ -356,7 +356,7 @@ test_return_t libmemcached_check_configuration_with_filename_test(memcached_st*)
                     libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=\"support/example.cnf\""), buffer, sizeof(buffer)),
                     buffer);
 
-  test_compare_hint(MEMCACHED_SUCCESS,
+  test_compare_hint(MEMCACHED_PARSE_ERROR,
                     libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=support/example.cnf"), buffer, sizeof(buffer)),
                     buffer);
 
@@ -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);