diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-02-17 18:51:31 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-02-17 18:51:31 +0100 |
| commit | a045d390759986c8cb73b826e8903099de3f8ec9 (patch) | |
| tree | 0c68055ad3e15af0aab54b1bc8351b51fd22c8ad /cpp | |
| parent | Fixed bug 3732 - bogus startService method implementation (diff) | |
| download | ice-a045d390759986c8cb73b826e8903099de3f8ec9.tar.bz2 ice-a045d390759986c8cb73b826e8903099de3f8ec9.tar.xz ice-a045d390759986c8cb73b826e8903099de3f8ec9.zip | |
Changed TestUtil.startServer to set echo = True by default
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/test/IceStorm/rep1/run.py | 4 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/repstress/run.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cpp/test/IceStorm/rep1/run.py b/cpp/test/IceStorm/rep1/run.py index 5ef589d9d00..dd374f172d4 100755 --- a/cpp/test/IceStorm/rep1/run.py +++ b/cpp/test/IceStorm/rep1/run.py @@ -42,7 +42,7 @@ def runtest(opt, ref, subopt="", pubopt=""): subscriberProc.waitTestSuccess(timeout=30) def runsub2(replica = -1, expect = None): - proc = TestUtil.startServer(subscriber2, icestorm.reference(replica) + ' --id foo', count=0) + proc = TestUtil.startServer(subscriber2, icestorm.reference(replica) + ' --id foo', count=0, echo = False) if expect: proc.expect(expect) proc.wait() @@ -55,7 +55,7 @@ def rununsub2(replica = -1, expect = None): proc.waitTestSuccess() # Else we first subscribe to this replica, then unsub. We # shouldn't get an AlreadySubscribedException. - proc = TestUtil.startServer(subscriber2, icestorm.reference(replica) + ' --id foo', count=0) + proc = TestUtil.startServer(subscriber2, icestorm.reference(replica) + ' --id foo', count=0, echo = False) if expect: proc.expect(expect) proc.wait() diff --git a/cpp/test/IceStorm/repstress/run.py b/cpp/test/IceStorm/repstress/run.py index 848d41b10d1..46bb3d7ce51 100755 --- a/cpp/test/IceStorm/repstress/run.py +++ b/cpp/test/IceStorm/repstress/run.py @@ -41,14 +41,14 @@ print "ok" print "running subscriber...", sys.stdout.flush() -subscriberProc = TestUtil.startServer(subscriber, ' --Ice.ServerIdleTime=0 ' + icestorm.reference()) +subscriberProc = TestUtil.startServer(subscriber, ' --Ice.ServerIdleTime=0 ' + icestorm.reference(), echo = False) subscriberProc.expect("([^\n]+)\n") subControl = subscriberProc.match.group(1) print "ok" print "running publisher...", sys.stdout.flush() -publisherProc = TestUtil.startServer(publisher, ' --Ice.ServerIdleTime=0 ' + icestorm.reference()) +publisherProc = TestUtil.startServer(publisher, ' --Ice.ServerIdleTime=0 ' + icestorm.reference(), echo = False) publisherProc.expect("([^\n]+)\n") pubControl = publisherProc.match.group(1) print "ok" |