commit 3495b8009c544771975ed6a32ed112d70ee5f9a5
author Davide Pesavento <davide.pesavento@lip6.fr> Mon Sep 19 02:36:59 2016 +0200
committer Davide Pesavento <davide.pesavento@lip6.fr> Tue Sep 20 15:53:31 2016 +0200
tree b46a8aff65fd8fd3a25cdb2f536d56d83bd96a1d
parent c143afea10d0b3b6e4cbc7b6c475549d862faa85

face: fix TestWebSocketTransport/StaticPropertiesNonLocalIpv4 on Travis CI

Don't assume that the local address of the client is the same as the remote
address seen by the server. The client may be behind a NAT, for example.

Change-Id: I2de084830c364e28c49de8fdbce60b46f76727ad
Refs: #3676

tests/daemon/face/websocket-transport.t.cpp

diff --git a/tests/daemon/face/websocket-transport.t.cpp b/tests/daemon/face/websocket-transport.t.cpp
index 993ebc2..8442480 100644
--- a/tests/daemon/face/websocket-transport.t.cpp
+++ b/tests/daemon/face/websocket-transport.t.cpp
@@ -91,7 +91,7 @@
     client.set_ping_handler(bind(&SingleWebSocketFixture::clientHandlePing, this));
 
     websocketpp::lib::error_code ec;
-    websocket::Client::connection_ptr con = client.get_connection(uri, ec);
+    auto con = client.get_connection(uri, ec);
     BOOST_REQUIRE_EQUAL(ec, websocketpp::lib::error_code());
 
     client.connect(con);
@@ -132,6 +132,12 @@
   void
   serverHandleOpen(websocketpp::connection_hdl hdl)
   {
+    websocketpp::lib::error_code ec;
+    auto con = server.get_con_from_hdl(hdl, ec);
+    BOOST_REQUIRE_EQUAL(ec, websocketpp::lib::error_code());
+    BOOST_REQUIRE(con);
+    remoteEp = con->get_socket().remote_endpoint();
+
     serverHdl = hdl;
     limitedIo.afterOp();
   }
@@ -206,6 +212,7 @@
 
   websocket::Server server;
   websocketpp::connection_hdl serverHdl;
+  ip::tcp::endpoint remoteEp;
   unique_ptr<Face> face;
   WebSocketTransport* transport;
   std::vector<Transport::Packet>* serverReceivedPackets;
@@ -222,14 +229,13 @@
 {
   auto address = getTestIp<ip::address_v4>(LoopbackAddress::Yes);
   SKIP_IF_IP_UNAVAILABLE(address);
-  this->endToEndInitialize(ip::tcp::endpoint(address, 20070));
+  ip::tcp::endpoint ep(address, 20070);
+  this->endToEndInitialize(ep);
 
   checkStaticPropertiesInitialized(*transport);
 
-  BOOST_CHECK_EQUAL(transport->getLocalUri(), FaceUri("ws://127.0.0.1:20070"));
-  BOOST_CHECK_EQUAL(transport->getRemoteUri().getScheme(), "wsclient");
-  BOOST_CHECK_EQUAL(transport->getRemoteUri().getHost(), "127.0.0.1");
-  BOOST_CHECK_EQUAL(transport->getRemoteUri().getPath(), "");
+  BOOST_CHECK_EQUAL(transport->getLocalUri(), FaceUri(ep, "ws"));
+  BOOST_CHECK_EQUAL(transport->getRemoteUri(), FaceUri(remoteEp, "wsclient"));
   BOOST_CHECK_EQUAL(transport->getScope(), ndn::nfd::FACE_SCOPE_LOCAL);
   BOOST_CHECK_EQUAL(transport->getPersistency(), ndn::nfd::FACE_PERSISTENCY_ON_DEMAND);
   BOOST_CHECK_EQUAL(transport->getLinkType(), ndn::nfd::LINK_TYPE_POINT_TO_POINT);
@@ -240,14 +246,13 @@
 {
   auto address = getTestIp<ip::address_v4>(LoopbackAddress::No);
   SKIP_IF_IP_UNAVAILABLE(address);
-  this->endToEndInitialize(ip::tcp::endpoint(address, 20070));
+  ip::tcp::endpoint ep(address, 20070);
+  this->endToEndInitialize(ep);
 
   checkStaticPropertiesInitialized(*transport);
 
-  BOOST_CHECK_EQUAL(transport->getLocalUri(), FaceUri("ws://" + address.to_string() + ":20070"));
-  BOOST_CHECK_EQUAL(transport->getRemoteUri().getScheme(), "wsclient");
-  BOOST_CHECK_EQUAL(transport->getRemoteUri().getHost(), address.to_string());
-  BOOST_CHECK_EQUAL(transport->getRemoteUri().getPath(), "");
+  BOOST_CHECK_EQUAL(transport->getLocalUri(), FaceUri(ep, "ws"));
+  BOOST_CHECK_EQUAL(transport->getRemoteUri(), FaceUri(remoteEp, "wsclient"));
   BOOST_CHECK_EQUAL(transport->getScope(), ndn::nfd::FACE_SCOPE_NON_LOCAL);
   BOOST_CHECK_EQUAL(transport->getPersistency(), ndn::nfd::FACE_PERSISTENCY_ON_DEMAND);
   BOOST_CHECK_EQUAL(transport->getLinkType(), ndn::nfd::LINK_TYPE_POINT_TO_POINT);
@@ -260,17 +265,13 @@
   SKIP_IF_IP_UNAVAILABLE(address4);
   auto address6 = ip::address_v6::v4_mapped(address4);
   BOOST_REQUIRE(address6.is_v4_mapped());
-  this->endToEndInitialize(ip::tcp::endpoint(address6, 20070));
+  ip::tcp::endpoint ep(address6, 20070);
+  this->endToEndInitialize(ep);
 
   checkStaticPropertiesInitialized(*transport);
 
-  BOOST_CHECK_EQUAL(transport->getLocalUri().getScheme(), "ws");
-  BOOST_CHECK_EQUAL(transport->getLocalUri().getHost(), "::ffff:127.0.0.1");
-  BOOST_CHECK_EQUAL(transport->getLocalUri().getPort(), "20070");
-  BOOST_CHECK_EQUAL(transport->getLocalUri().getPath(), "");
-  BOOST_CHECK_EQUAL(transport->getRemoteUri().getScheme(), "wsclient");
-  BOOST_CHECK_EQUAL(transport->getRemoteUri().getHost(), "::ffff:127.0.0.1");
-  BOOST_CHECK_EQUAL(transport->getRemoteUri().getPath(), "");
+  BOOST_CHECK_EQUAL(transport->getLocalUri(), FaceUri(ep, "ws"));
+  BOOST_CHECK_EQUAL(transport->getRemoteUri(), FaceUri(remoteEp, "wsclient"));
   BOOST_CHECK_EQUAL(transport->getScope(), ndn::nfd::FACE_SCOPE_LOCAL);
   BOOST_CHECK_EQUAL(transport->getPersistency(), ndn::nfd::FACE_PERSISTENCY_ON_DEMAND);
   BOOST_CHECK_EQUAL(transport->getLinkType(), ndn::nfd::LINK_TYPE_POINT_TO_POINT);