removing two-threads-per-connection

1 files changed, 8 insertions, 9 deletions

diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index f50b090a411..1fa8d798860 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -24,13 +24,12 @@ compress = 0
 #compress = 1
 
 #
-# Set threadPerConnection to 1 or 2 in case you want to run the tests in
-# one or two thread per connection mode.
+# Set threadPerConnection to 1 in case you want to run the tests in
+# thread per connection mode.
 #
 
 threadPerConnection = 0
 #threadPerConnection = 1
-#threadPerConnection = 2
 
 #
 # If you don't set "host" below, then the Ice library will try to find
@@ -53,10 +52,10 @@ import sys, os, re, errno, getopt
 from threading import Thread
 
 def usage():
-    print "usage: " + sys.argv[0] + " --debug --protocol ssl|tcp --compress --host host --threadPerConnection num"
+    print "usage: " + sys.argv[0] + " --debug --protocol ssl|tcp --compress --host host --threadPerConnection"
     sys.exit(2)
 try:
-    opts, args = getopt.getopt(sys.argv[1:], "", ["debug", "protocol=", "compress", "host=", "threadPerConnection="])
+    opts, args = getopt.getopt(sys.argv[1:], "", ["debug", "protocol=", "compress", "host=", "threadPerConnection"])
 except getopt.GetoptError:
     usage()
 
@@ -70,7 +69,7 @@ for o, a in opts:
     if o == "--compress":
 	compress = 1
     if o == "--threadPerConnection":
-	threadPerConnection = a
+	threadPerConnection = 1
     if o == "--host":
 	host = a
 
@@ -417,9 +416,9 @@ commonClientOptions = " --Ice.NullHandleAbort --Ice.Warn.Connections"
 commonServerOptions = " --Ice.PrintProcessId --Ice.PrintAdapterReady --Ice.NullHandleAbort" + \
                       " --Ice.Warn.Connections --Ice.ServerIdleTime=30"
 
-if threadPerConnection > 0:
-    commonClientOptions += " --Ice.ThreadPerConnection=" + str(threadPerConnection)
-    commonServerOptions += " --Ice.ThreadPerConnection=" + str(threadPerConnection)
+if threadPerConnection:
+    commonClientOptions += " --Ice.ThreadPerConnection"
+    commonServerOptions += " --Ice.ThreadPerConnection"
 else:
     commonServerOptions += " --Ice.ThreadPool.Server.Size=1 --Ice.ThreadPool.Server.SizeMax=3" + \
 			   " --Ice.ThreadPool.Server.SizeWarn=0"