diff options
| author | Joe George <joe@zeroc.com> | 2014-10-15 15:42:10 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2014-10-15 15:44:04 -0400 |
| commit | 683ef72bfe5ea002a366291c6f7d5aaab811c8c3 (patch) | |
| tree | 446dc9d20715657ba3dfba2f280c3ff89a1ba12a /demoscript/IceStorm/clock.py | |
| parent | minor style fixes (diff) | |
| download | ice-683ef72bfe5ea002a366291c6f7d5aaab811c8c3.tar.bz2 ice-683ef72bfe5ea002a366291c6f7d5aaab811c8c3.tar.xz ice-683ef72bfe5ea002a366291c6f7d5aaab811c8c3.zip | |
Fix ICE-5745 - IceStorm demos were not properly shutting down from scripts
Diffstat (limited to 'demoscript/IceStorm/clock.py')
| -rwxr-xr-x | demoscript/IceStorm/clock.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/demoscript/IceStorm/clock.py b/demoscript/IceStorm/clock.py index 22746867e8a..24cd44a4702 100755 --- a/demoscript/IceStorm/clock.py +++ b/demoscript/IceStorm/clock.py @@ -47,7 +47,7 @@ def run(subCmd, pubCmd): args = '' icestorm = Util.spawn('%s --Ice.Config=config.icebox --Ice.PrintAdapterReady %s' % (Util.getIceBox(), args)) - + icestorm.expect('.* ready') runtest(icestorm, subCmd, "", pubCmd, "") @@ -59,6 +59,7 @@ def run(subCmd, pubCmd): for s in pubargs: runtest(icestorm, subCmd, "", pubCmd, s) - admin = Util.spawn(Util.getIceBoxAdmin() + ' --Ice.Config=config.icebox shutdown') + admin = Util.spawn(Util.getIceBoxAdmin() + ' --IceBoxAdmin.ServiceManager.Proxy="icebox/admin \ + -f IceBox.ServiceManager:tcp -p 9996 -h 127.0.0.1" shutdown') admin.waitTestSuccess() icestorm.waitTestSuccess() |