diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-03-28 20:53:42 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-03-28 20:53:42 +0000 |
| commit | 0a58e76f0fde2dcddd5505951fe5f1201d36ced7 (patch) | |
| tree | 1929d74d1a70670fe74e863de4dacad5c37aa7a4 /cpp/config/TestUtil.py | |
| parent | minor fix (diff) | |
| download | ice-0a58e76f0fde2dcddd5505951fe5f1201d36ced7.tar.bz2 ice-0a58e76f0fde2dcddd5505951fe5f1201d36ced7.tar.xz ice-0a58e76f0fde2dcddd5505951fe5f1201d36ced7.zip | |
new IceSSL plugin
Diffstat (limited to 'cpp/config/TestUtil.py')
| -rw-r--r-- | cpp/config/TestUtil.py | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py index 2a3fc86c7f1..de764030638 100644 --- a/cpp/config/TestUtil.py +++ b/cpp/config/TestUtil.py @@ -13,8 +13,8 @@ # protocol. Otherwise TCP is used. # -#protocol = "ssl" -protocol = "tcp" +protocol = "ssl" +#protocol = "tcp" # # Set compressed to 1 in case you want to run the tests with @@ -242,16 +242,24 @@ else: if protocol == "ssl": plugin = " --Ice.Plugin.IceSSL=IceSSL:create" clientProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.Client.Config=client_sslconfig.xml" + " --IceSSL.Client.DefaultDir=" + os.path.join(toplevel, "certs") + \ + " --IceSSL.Client.CertFile=c_rsa1024_pub.pem" + \ + " --IceSSL.Client.KeyFile=c_rsa1024_priv.pem" + \ + " --IceSSL.Client.CertAuthFile=cacert.pem" serverProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.Server.Config=server_sslconfig.xml" + " --IceSSL.Server.DefaultDir=" + os.path.join(toplevel, "certs") + \ + " --IceSSL.Server.CertFile=s_rsa1024_pub.pem" + \ + " --IceSSL.Server.KeyFile=s_rsa1024_priv.pem" + \ + " --IceSSL.Server.CertAuthFile=cacert.pem" clientServerProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.Client.Config=sslconfig.xml" + \ - " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.Server.Config=sslconfig.xml" + " --IceSSL.Client.DefaultDir=" + os.path.join(toplevel, "certs") + \ + " --IceSSL.Client.CertFile=c_rsa1024_pub.pem" + \ + " --IceSSL.Client.KeyFile=c_rsa1024_priv.pem" + \ + " --IceSSL.Client.CertAuthFile=cacert.pem" + \ + " --IceSSL.Server.DefaultDir=" + os.path.join(toplevel, "certs") + \ + " --IceSSL.Server.CertFile=s_rsa1024_pub.pem" + \ + " --IceSSL.Server.KeyFile=s_rsa1024_priv.pem" + \ + " --IceSSL.Server.CertAuthFile=cacert.pem" else: clientProtocol = "" serverProtocol = "" @@ -292,13 +300,17 @@ def clientServerTestWithOptionsAndNames(name, additionalServerOptions, additiona client = os.path.join(testdir, clientName) print "starting " + serverName + "...", - serverPipe = os.popen(server + serverOptions + additionalServerOptions + " 2>&1") + serverCmd = server + serverOptions + additionalServerOptions + " 2>&1" + #print "serverCmd =", serverCmd + serverPipe = os.popen(serverCmd) getServerPid(serverPipe) getAdapterReady(serverPipe) print "ok" print "starting " + clientName + "...", - clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1") + clientCmd = client + clientOptions + additionalClientOptions + " 2>&1" + #print "clientCmd =", clientCmd + clientPipe = os.popen(clientCmd) print "ok" printOutputFromPipe(clientPipe) |