テストコード修正

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel@9031 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/l7vsd/unit_tests/session_test/tcp_ssl_socket/Makefile b/l7vsd/unit_tests/session_test/tcp_ssl_socket/Makefile
index 6d9212d..a9c8048 100644 (file)
--- a/l7vsd/unit_tests/session_test/tcp_ssl_socket/Makefile
+++ b/l7vsd/unit_tests/session_test/tcp_ssl_socket/Makefile
@@ -3,7 +3,7 @@
 #      Makefile for tcp_ssl_socket_test Class unit test frameworks.
 #
 #
-TARGET         = tcp_socket_test_ut
+TARGET         = tcp_ssl_socket_test_ut
 CPP                    = g++
 CPPFLAGS       = -O0 -g -Werror -Wall -pthread -DMAX_BUFFER_SIZE=65535 -DDEBUG
 INCLUDES       =               -I/usr/include \

diff --git a/l7vsd/unit_tests/session_test/tcp_ssl_socket/tcp_ssl_socket_test.cpp b/l7vsd/unit_tests/session_test/tcp_ssl_socket/tcp_ssl_socket_test.cpp
index 33605ef..2928b0c 100644 (file)
--- a/l7vsd/unit_tests/session_test/tcp_ssl_socket/tcp_ssl_socket_test.cpp
+++ b/l7vsd/unit_tests/session_test/tcp_ssl_socket/tcp_ssl_socket_test.cpp
@@ -63,7 +63,6 @@ class test_client{
                 l7vs::rw_scoped_lock scope_lock(close_mutex);
                 close_test();
             }
-
         };
 
         void handshake_test_run(){
@@ -941,6 +940,10 @@ void close_test(){
 
     test_obj.get_open_flag() = true;
 
+  // close
+    dummy_cl.close_mutex.unlock();
+    cl_thread.join();
+
     // unit_test [1] close test close success error_code object
     std::cout << "[1] close test close success error_code object" << std::endl;
     test_obj.close(ec);
@@ -950,10 +953,6 @@ void close_test(){
     std::cout << "[2] close test open_flag set false" << std::endl;
     BOOST_CHECK(!test_obj.get_open_flag());
 
-    // close
-    dummy_cl.close_mutex.unlock();
-    cl_thread.join();
-
     test_acceptor.close();
 
     BOOST_MESSAGE( "----- close test end -----" );