diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-05-23 11:59:44 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-05-23 11:59:44 +0200 |
| commit | d81701ca8182942b7936f9fd84a019b695e9c890 (patch) | |
| tree | dc036c9d701fbbe1afad67782bd78572c0f61974 /py/demo/Ice/metrics/expect.py | |
| parent | Fixed bug ICE-5543: stringToIdentity bug with escaped escapes (diff) | |
| download | ice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.bz2 ice-d81701ca8182942b7936f9fd84a019b695e9c890.tar.xz ice-d81701ca8182942b7936f9fd84a019b695e9c890.zip | |
Added support for invocation timeouts and ACM heartbeats
Diffstat (limited to 'py/demo/Ice/metrics/expect.py')
| -rwxr-xr-x | py/demo/Ice/metrics/expect.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/py/demo/Ice/metrics/expect.py b/py/demo/Ice/metrics/expect.py index 1104c506ce5..7133b17f4a4 100755 --- a/py/demo/Ice/metrics/expect.py +++ b/py/demo/Ice/metrics/expect.py @@ -26,28 +26,28 @@ from demoscript.Ice import async cwd = os.getcwd(); os.chdir("../hello") -server = Util.spawn('Server.py --Ice.Admin.Endpoints="tcp -p 10002" --Ice.PrintAdapterReady') +server = Util.spawn('Server.py --Ice.Admin.Endpoints="tcp -p 10005" --Ice.PrintAdapterReady') server.expect('.* ready') -client = Util.spawn('Client.py --Ice.Admin.Endpoints="tcp -p 10003"') +client = Util.spawn('Client.py --Ice.Admin.Endpoints="tcp -p 10006"') client.expect('.*==>') os.chdir(cwd) sys.stdout.write("testing server metrics dump... ") sys.stdout.flush() -metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10002" --InstanceName=server dump') +metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10005" --InstanceName=server dump') metrics.expect("View: ByParent") metrics.expect("View: Debug") metrics.waitTestSuccess() client.sendline('t') -metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10002" --InstanceName=server dump Debug Dispatch') +metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10005" --InstanceName=server dump Debug Dispatch') metrics.expect("hello\s\[sayHello\]\s*\|\s*0\|\s*1\|.*\|") metrics.waitTestSuccess() client.sendline('t') -metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10002" --InstanceName=server dump Debug Dispatch') +metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10005" --InstanceName=server dump Debug Dispatch') metrics.expect("hello\s\[sayHello\]\s*\|\s*0\|\s*2\|.*\|") metrics.waitTestSuccess() @@ -57,23 +57,23 @@ print("ok") sys.stdout.write("testing client metrics dump... ") sys.stdout.flush() -metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10003" --InstanceName=client dump') +metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10006" --InstanceName=client dump') metrics.expect("View: ByParent") metrics.expect("View: Debug") metrics.waitTestSuccess() client.sendline('t') -metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10003" --InstanceName=client dump Debug Invocation') +metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10006" --InstanceName=client dump Debug Invocation') metrics.expect("hello -t -e 1.1 \[sayHello\]\s*\|\s*0\|\s*3\|.*") metrics.waitTestSuccess() client.sendline('t') -metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10003" --InstanceName=client dump Debug Invocation') +metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10006" --InstanceName=client dump Debug Invocation') metrics.expect("hello -t -e 1.1 \[sayHello\]\s*\|\s*0\|\s*4\|.*") metrics.waitTestSuccess() client.sendline('o') -metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10003" --InstanceName=client dump Debug Invocation') +metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10006" --InstanceName=client dump Debug Invocation') metrics.expect("hello -o -e 1.1 \[sayHello\]\s*\|\s*0\|\s*1\|.*") metrics.waitTestSuccess() @@ -82,18 +82,18 @@ print("ok") sys.stdout.write("testing view enable/disable... ") sys.stdout.flush() -metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10002" --InstanceName=server disable ByParent') +metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10005" --InstanceName=server disable ByParent') metrics.waitTestSuccess() -metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10002" --InstanceName=server dump') +metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10005" --InstanceName=server dump') metrics.expect("View: ([a-zA-Z]*)") assert metrics.match.group(1).strip() == "Debug" metrics.waitTestSuccess() -metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10002" --InstanceName=server enable ByParent') +metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10005" --InstanceName=server enable ByParent') metrics.waitTestSuccess() -metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10002" --InstanceName=server dump') +metrics = Util.spawn('Metrics.py --Endpoints="tcp -p 10005" --InstanceName=server dump') metrics.expect("View: ([a-zA-Z]*)") assert metrics.match.group(1).strip() == "ByParent" metrics.waitTestSuccess() |