Making Server tests' port to run on configurable

deanberris · deanberris · commit 1675db043f2f · 2011-03-06T18:59:41.000+08:00
This addresses some concerns with the unit tests for servers that don't
run mainly because the port they're all trying to run on (port 8000) is
being used across all the executables. Even if the socket address is
reused, that will only make sense for the same executable on UNIX/Linux.
Now the tests run on different ports, with the help of changes in the
tests and the CMake configuration.
diff --git a/libs/network/test/http/CMakeLists.txt b/libs/network/test/http/CMakeLists.txt
@@ -25,7 +25,11 @@ if (Boost_FOUND)
         client_get_test
         client_get_different_port_test
         client_get_timeout_test
+        client_localhost_normal_test
         )
+    if (OPENSSL_FOUND)
+        set ( TESTS ${TESTS} client_localhost_ssl_test )
+    endif (OPENSSL_FOUND)
     foreach ( test ${TESTS} )
         if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
             set_source_files_properties(${test}.cpp
@@ -63,7 +67,9 @@ if (Boost_FOUND)
     set ( SERVER_TESTS
         server_hello_world
         server_async
+        server_async_less_copy
         )
+    set ( PORT 8000 )
     foreach ( test ${SERVER_TESTS} )
         if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
             set_source_files_properties(${test}.cpp
@@ -79,7 +85,9 @@ if (Boost_FOUND)
             python 
             ${CPP-NETLIB_SOURCE_DIR}/libs/network/test/httplib_acceptance.py 
             ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test}
+            ${PORT}
             ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test}.passed)
+        math (EXPR PORT "${PORT} + 1")
     endforeach (test)
 
     set ( INLINED_TESTS
diff --git a/libs/network/test/http/server_async.cpp b/libs/network/test/http/server_async.cpp
@@ -59,7 +59,9 @@ struct async_hello_world {
 int main(int argc, char * argv[]) {
     utils::thread_pool thread_pool(2); 
     async_hello_world handler;
-    server instance("127.0.0.1", "8000", handler, thread_pool, http::_reuse_address=true);
+    std::string port = "8000";
+    if (argc > 1) port = argv[1];
+    server instance("127.0.0.1", port, handler, thread_pool, http::_reuse_address=true);
     instance.run();
     return 0;
 }
diff --git a/libs/network/test/http/server_async_less_copy.cpp b/libs/network/test/http/server_async_less_copy.cpp
@@ -67,7 +67,9 @@ struct async_hello_world {
 int main(int argc, char * argv[]) {
     utils::thread_pool thread_pool(2); 
     async_hello_world handler;
-    server instance("127.0.0.1", "8000", handler, thread_pool, http::_reuse_address=true);
+    std::string port = "8000";
+    if (argc > 1) port = argv[1];
+    server instance("127.0.0.1", port, handler, thread_pool, http::_reuse_address=true);
     instance.run();
     return 0;
 }
diff --git a/libs/network/test/http/server_hello_world.cpp b/libs/network/test/http/server_hello_world.cpp
@@ -43,7 +43,9 @@ struct hello_world {
 
 int main(int argc, char * argv[]) {
     hello_world handler;
-    server server_("127.0.0.1", "8000", handler, http::_reuse_address=true);
+    std::string port = "8000";
+    if (argc > 1) port = argv[1];
+    server server_("127.0.0.1", port, handler, http::_reuse_address=true);
     server_.run();
     return EXIT_SUCCESS;
 }
diff --git a/libs/network/test/httplib_acceptance.py b/libs/network/test/httplib_acceptance.py
@@ -10,15 +10,15 @@
 import httplib2 as httplib
 from subprocess import Popen,PIPE
 
-if len(argv) < 3:
-    print('I need the executable to run.')
+if len(argv) < 4:
+    print('I need the executable to run, the port to run it on, and the final touched file indicator.')
     exit(1)
 
-print('Running {0}...'.format(argv[1]))
+print('Running {0} on port {1}...'.format(argv[1], argv[2]))
 
 pipe = None
 try:
-    pipe = Popen(argv[1], executable=argv[1], stdin=PIPE, stdout=PIPE, close_fds=True)
+    pipe = Popen(args=[argv[1], argv[2]], executable=argv[1], stdin=PIPE, stdout=PIPE, close_fds=True)
     print('Done with spawning {0}.'.format(argv[1]))
     print('Sleeping to give the server a chance to run...')
     sleep(1)
@@ -58,7 +58,7 @@ def test_status(url, method, expected, headers={}, body=''):
         print('Caught Exception: {0}'.format(e))
         status = 1
 
-url = 'http://localhost:8000/'
+url = 'http://localhost:{0}/'.format(argv[2])
 test(url, 'GET', expected)
 test(url, 'DELETE', expected)
 # Good request case, there's a content-length header for POST
@@ -72,10 +72,10 @@ def test_status(url, method, expected, headers={}, body=''):
 
 if status != 0:
     print('Failures encountered.')
-    pipe.kill()
+    pipe.terminate()
     exit(status)
 
 open(argv[len(argv) - 1], 'w').close()
 print('All tests pass.')
-pipe.kill()
+pipe.terminate()
 
