diff options
Diffstat (limited to 'cpp/test/Glacier2/ssl/run.py')
| -rwxr-xr-x | cpp/test/Glacier2/ssl/run.py | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/cpp/test/Glacier2/ssl/run.py b/cpp/test/Glacier2/ssl/run.py index d25504b6741..877760001da 100755 --- a/cpp/test/Glacier2/ssl/run.py +++ b/cpp/test/Glacier2/ssl/run.py @@ -22,50 +22,48 @@ import TestUtil name = os.path.join("Glacier2", "ssl") -testdir = os.path.join(toplevel, "test", name) +testdir = os.path.dirname(os.path.abspath(__file__)) server = os.path.join(testdir, "server") -command = server + TestUtil.clientServerOptions print "starting server...", -serverPipe = os.popen(command + " 2>&1") +serverPipe = TestUtil.startServer(server, " 2>&1") TestUtil.getServerPid(serverPipe) TestUtil.getAdapterReady(serverPipe) print "ok" -router = os.path.join(toplevel, "bin", "glacier2router") -command = router + TestUtil.clientServerOptions + \ - r' --Ice.Warn.Dispatch=0' + \ - r' --Glacier2.AddSSLContext=1' + \ - r' --Glacier2.Client.Endpoints="tcp -h 127.0.0.1 -p 12347 -t 10000:ssl -h 127.0.0.1 -p 12348 -t 10000"' + \ - r' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ - r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12349 -t 10000"' + \ - r' --Ice.Admin.InstanceName=Glacier2' + \ - r' --Glacier2.SessionManager="sessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ - r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \ - r' --Glacier2.SSLSessionManager="sslsessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ - r' --Glacier2.SSLPermissionsVerifier="sslverifier:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ - r" --Ice.Plugin.IceSSL=IceSSL:createIceSSL" + \ - r" --IceSSL.DefaultDir=" + os.path.join(toplevel, "certs") + \ - r' --IceSSL.CertFile=s_rsa1024_pub.pem' + \ - r' --IceSSL.KeyFile=s_rsa1024_priv.pem' + \ - r' --IceSSL.CertAuthFile=cacert.pem' +router = os.path.join(TestUtil.getBinDir(__file__), "glacier2router") + +args = r' --Ice.Warn.Dispatch=0' + \ + r' --Glacier2.AddSSLContext=1' + \ + r' --Glacier2.Client.Endpoints="tcp -h 127.0.0.1 -p 12347 -t 10000:ssl -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ + r' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12349 -t 10000"' + \ + r' --Ice.Admin.InstanceName=Glacier2' + \ + r' --Glacier2.SessionManager="sessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ + r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \ + r' --Glacier2.SSLSessionManager="sslsessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ + r' --Glacier2.SSLPermissionsVerifier="sslverifier:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ + r" --Ice.Plugin.IceSSL=IceSSL:createIceSSL" + \ + r" --IceSSL.DefaultDir=" + TestUtil.getCertsDir(__file__) + \ + r' --IceSSL.CertFile=s_rsa1024_pub.pem' + \ + r' --IceSSL.KeyFile=s_rsa1024_priv.pem' + \ + r' --IceSSL.CertAuthFile=cacert.pem' print "starting router...", -starterPipe = os.popen(command + " 2>&1") +starterPipe = TestUtil.startServer(router, args + " 2>&1") TestUtil.getServerPid(starterPipe) TestUtil.getAdapterReady(starterPipe) print "ok" client = os.path.join(testdir, "client") -command = client + TestUtil.clientOptions + \ - " --Ice.Plugin.IceSSL=IceSSL:createIceSSL" + \ - " --IceSSL.DefaultDir=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.CertFile=c_rsa1024_pub.pem" + \ - " --IceSSL.KeyFile=c_rsa1024_priv.pem" + \ - " --IceSSL.CertAuthFile=cacert.pem" +args = " --Ice.Plugin.IceSSL=IceSSL:createIceSSL" + \ + " --IceSSL.DefaultDir=" + TestUtil.getCertsDir(__file__) + \ + " --IceSSL.CertFile=c_rsa1024_pub.pem" + \ + " --IceSSL.KeyFile=c_rsa1024_priv.pem" + \ + " --IceSSL.CertAuthFile=cacert.pem" print "starting client...", -clientPipe = os.popen(command + " 2>&1") +clientPipe = TestUtil.startClient(client, args + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) |