Merge remote-tracking branch 'core/master' into 1.10.1_prep

Author: Michael Penick

cpp-driver/tests/src/unit/tests/test_name_resolver.cpp

@@ -19,10 +19,6 @@
 #include "callback.hpp"
 #include "name_resolver.hpp"
 
-#ifdef WIN32
-#include "winsock.h"
-#endif
-
 #define RESOLVE_TIMEOUT 2000
 
 using namespace datastax;
@@ -54,21 +50,15 @@ class NameResolverUnitTest : public LoopTest {
 };
 
 TEST_F(NameResolverUnitTest, Simple) {
-  NameResolver::Ptr resolver(create(Address("127.0.0.1", 9042)));
+  NameResolver::Ptr resolver(create(Address("127.254.254.254", 9042)));
   resolver->resolve(loop(), RESOLVE_TIMEOUT);
   run_loop();
   ASSERT_EQ(NameResolver::SUCCESS, status());
-#ifdef WIN32
-  char win_hostname[64];
-  gethostname(win_hostname, 64);
-  EXPECT_EQ(String(win_hostname), hostname());
-#else
-  EXPECT_EQ("localhost", hostname());
-#endif
+  EXPECT_EQ("cpp-driver.hostname.", hostname());
 }
 
 TEST_F(NameResolverUnitTest, Timeout) {
-  NameResolver::Ptr resolver(create(Address("127.0.0.1", 9042)));
+  NameResolver::Ptr resolver(create(Address("127.254.254.254", 9042)));
 
   // Libuv's address resolver uses the uv_work thread pool to handle resolution
   // asynchronously. If we starve all the threads in the uv_work thread pool
@@ -91,7 +81,7 @@ TEST_F(NameResolverUnitTest, Invalid) {
 }
 
 TEST_F(NameResolverUnitTest, Cancel) {
-  NameResolver::Ptr resolver(create(Address("127.0.0.1", 9042)));
+  NameResolver::Ptr resolver(create(Address("127.254.254.254", 9042)));
   resolver->resolve(loop(), RESOLVE_TIMEOUT);
   resolver->cancel();
   run_loop();