diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2011-07-12 08:10:58 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2011-07-12 08:10:58 +0200 |
| commit | 4da4a0c2eb024d61f7ceaf173dc9e9c456a0e805 (patch) | |
| tree | 876bc9ed1ed4a9cdc0ff2829666c99682fc9d95d /cpp/demo/IceGrid/secure/expect.py | |
| parent | Fixed bug 5166 - process deactivation bug (diff) | |
| download | ice-4da4a0c2eb024d61f7ceaf173dc9e9c456a0e805.tar.bz2 ice-4da4a0c2eb024d61f7ceaf173dc9e9c456a0e805.tar.xz ice-4da4a0c2eb024d61f7ceaf173dc9e9c456a0e805.zip | |
Added support for replica & name cert CN verification
Diffstat (limited to 'cpp/demo/IceGrid/secure/expect.py')
| -rwxr-xr-x | cpp/demo/IceGrid/secure/expect.py | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/cpp/demo/IceGrid/secure/expect.py b/cpp/demo/IceGrid/secure/expect.py index 5827ee0b5f8..77feee84f70 100755 --- a/cpp/demo/IceGrid/secure/expect.py +++ b/cpp/demo/IceGrid/secure/expect.py @@ -24,7 +24,8 @@ import signal print "cleaning databases...", sys.stdout.flush() -Util.cleanDbDir("db/registry") +Util.cleanDbDir("db/master") +Util.cleanDbDir("db/slave") Util.cleanDbDir("db/node") Util.cleanDbDir("certs") print "ok" @@ -57,14 +58,27 @@ makecerts.expect("Sign the certificate?") makecerts.sendline("y") makecerts.expect("1 out of 1 certificate requests certified, commit?") makecerts.sendline("y") +makecerts.expect("Sign the certificate?") +makecerts.sendline("y") +makecerts.expect("1 out of 1 certificate requests certified, commit?") +makecerts.sendline("y") makecerts.waitTestSuccess() print "ok" print "starting icegrid...", sys.stdout.flush() -registryProps = " --Ice.PrintAdapterReady" -registry = Util.spawn(Util.getIceGridRegistry() + ' --Ice.Config=config.registry' + registryProps) -registry.expect('IceGrid.Registry.Internal ready\nIceGrid.Registry.Server ready\nIceGrid.Registry.Client ready') +masterProps = " --Ice.PrintAdapterReady" +master = Util.spawn(Util.getIceGridRegistry() + ' --Ice.Config=config.master' + masterProps) +master.expect('IceGrid.Registry.Internal ready') +master.expect('IceGrid.Registry.Server ready') +master.expect('IceGrid.Registry.Client ready') + +slaveProps = " --Ice.PrintAdapterReady" +slave = Util.spawn(Util.getIceGridRegistry() + ' --Ice.Config=config.slave' + slaveProps) +slave.expect('IceGrid.Registry.Internal ready') +slave.expect('IceGrid.Registry.Server ready') +slave.expect('IceGrid.Registry.Client ready') + node = Util.spawn(Util.getIceGridNode() + ' --Ice.Config=config.node --Ice.PrintAdapterReady %s' % (args)) node.expect('IceGrid.Node ready') print "ok" @@ -116,9 +130,13 @@ admin.sendline('node shutdown Node') admin.expect('>>>') node.waitTestSuccess(timeout=120) +admin.sendline('registry shutdown Slave') +admin.expect('>>>') +slave.waitTestSuccess() + admin.sendline('registry shutdown Master') admin.expect('>>>') -registry.waitTestSuccess() +master.waitTestSuccess() admin.sendline('exit') admin.waitTestSuccess(timeout=120) |