diff options
Diffstat (limited to 'cpp/config/TestUtil.py')
-rw-r--r-- | cpp/config/TestUtil.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py index 2b88b7efce7..b4915095d8d 100644 --- a/cpp/config/TestUtil.py +++ b/cpp/config/TestUtil.py @@ -334,7 +334,6 @@ def clientServerTestWithOptionsAndNames(name, additionalServerOptions, additiona printOutputFromPipe(clientPipe) clientStatus = closePipe(clientPipe) - #serverStatus = closePipe(serverPipe) serverThread.join() serverStatus = serverThread.getStatus() @@ -368,10 +367,13 @@ def mixedClientServerTestWithOptions(name, additionalServerOptions, additionalCl getAdapterReady(clientPipe) print "ok" + serverThread = ReaderThread(serverPipe, "Server") + serverThread.start() printOutputFromPipe(clientPipe) clientStatus = closePipe(clientPipe) - serverStatus = closePipe(serverPipe) + serverThread.join() + serverStatus = serverThread.getStatus() if clientStatus or serverStatus: killServers() |