summaryrefslogtreecommitdiff
path: root/AudioManagerDaemon/test
diff options
context:
space:
mode:
authorFrank Herchet <frank.fh.herchet@bmw.de>2012-04-24 09:37:37 +0200
committerchristian mueller <christian.ei.mueller@bmw.de>2012-05-24 13:40:22 +0200
commit2ebf13acbec713154637ab9a47a20315fa706013 (patch)
tree1e1a55d5c9726002a72c670e5eba4bdc4bf5ad76 /AudioManagerDaemon/test
parentb2c7d55427df5d31b6a63917f27264a676314d10 (diff)
downloadaudiomanager-2ebf13acbec713154637ab9a47a20315fa706013.tar.gz
*[GAM-71]: move connectNoMoreThreads test
*[GAM-71]: change timeout to 1.5s *[GAM-71]: fix connectAbortTooLate test * fix issue in CAmEnvironment::TearDown Signed-off-by: Christian Mueller <christian.ei.mueller@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/test')
-rw-r--r--AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp
index c907c76..ebc3705 100644
--- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp
+++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp
@@ -89,7 +89,7 @@ void CAmEnvironment::SetUp()
void CAmEnvironment::TearDown()
{
-
+ pthread_cancel(mSocketHandlerThread);
}
void CAmEnvironment::setSocketHandler(CAmSocketHandler* pSocketHandler)