commit 9f0d9619d20632e7f29d7a2edf802e79739fe110
author John Sirois <jsirois@apache.org> Fri Feb 12 16:15:43 2016 -0700
committer Nobuaki Sukegawa <nsuke@apache.org> Sat Feb 13 23:12:34 2016 +0900
tree 8bbf12fab6f9bec86e213e15cd65eb728e614c4f
parent 6a0ca7ff2750d45346d6d7faaf931de2b6254321

THRIFT-3621 Fix lib/cpp/test/SecurityTest.cpp to use ephemeral ports
Client: Test (C++)
Patch: John Sirois

Instead of using a fixed port, use an ephemeral port to improve
robustness and make way for parallelizability.

This closes #853

lib/cpp/test/SecurityTest.cpp

diff --git a/lib/cpp/test/SecurityTest.cpp b/lib/cpp/test/SecurityTest.cpp
index 5e9dfe4..9968e2c 100644
--- a/lib/cpp/test/SecurityTest.cpp
+++ b/lib/cpp/test/SecurityTest.cpp
@@ -29,7 +29,6 @@
 #include <thrift/transport/TSSLServerSocket.h>
 #include <thrift/transport/TSSLSocket.h>
 #include <thrift/transport/TTransport.h>
-#include "TestPortFixture.h"
 #include <vector>
 #ifdef __linux__
 #include <signal.h>
@@ -95,7 +94,7 @@
 BOOST_GLOBAL_FIXTURE(GlobalFixture)
 #endif
 
-struct SecurityFixture : public TestPortFixture
+struct SecurityFixture
 {
     void server(apache::thrift::transport::SSLProtocol protocol)
     {
@@ -111,12 +110,13 @@
             pServerSocketFactory->loadCertificate(certFile("server.crt").string().c_str());
             pServerSocketFactory->loadPrivateKey(certFile("server.key").string().c_str());
             pServerSocketFactory->server(true);
-            pServerSocket.reset(new TSSLServerSocket("localhost", m_serverPort, pServerSocketFactory));
+            pServerSocket.reset(new TSSLServerSocket("localhost", 0, pServerSocketFactory));
             boost::shared_ptr<TTransport> connectedClient;
 
             try
             {
                 pServerSocket->listen();
+                mPort = pServerSocket->getPort();
                 mCVar.notify_one();
                 lock.unlock();
 
@@ -163,7 +163,7 @@
                 pClientSocketFactory->loadCertificate(certFile("client.crt").string().c_str());
                 pClientSocketFactory->loadPrivateKey(certFile("client.key").string().c_str());
                 pClientSocketFactory->loadTrustedCertificates(certFile("CA.pem").string().c_str());
-                pClientSocket = pClientSocketFactory->createSocket("localhost", m_serverPort);
+                pClientSocket = pClientSocketFactory->createSocket("localhost", mPort);
                 pClientSocket->open();
 
                 uint8_t buf[3];
@@ -207,6 +207,7 @@
 
     boost::mutex mMutex;
     boost::condition_variable mCVar;
+    int mPort;
     bool mConnected;
 };