diff options
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/test/IceStorm/rep1/run.py | 1 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/repstress/run.py | 1 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/stress/run.py | 6 |
3 files changed, 2 insertions, 6 deletions
diff --git a/cpp/test/IceStorm/rep1/run.py b/cpp/test/IceStorm/rep1/run.py index 281c00580f0..7787db57b76 100755 --- a/cpp/test/IceStorm/rep1/run.py +++ b/cpp/test/IceStorm/rep1/run.py @@ -103,7 +103,6 @@ def rununsub2(replica = -1, terminateOnError=True): import IceStormUtil icestorm = IceStormUtil.init(toplevel, testdir, "replicated", replicatedPublisher=True, additional = - ' --Ice.ServerIdleTime=0 ' + ' --IceStorm.Election.MasterTimeout=2' + ' --IceStorm.Election.ElectionTimeout=2' + ' --IceStorm.Election.ResponseTimeout=2') diff --git a/cpp/test/IceStorm/repstress/run.py b/cpp/test/IceStorm/repstress/run.py index 27fe7acc1b6..c5103febb6b 100755 --- a/cpp/test/IceStorm/repstress/run.py +++ b/cpp/test/IceStorm/repstress/run.py @@ -59,7 +59,6 @@ def runcontrol(proxy): import IceStormUtil icestorm = IceStormUtil.init(toplevel, testdir, "replicated", replicatedPublisher=True, additional = - ' --Ice.ServerIdleTime=0 ' + ' --IceStorm.Election.MasterTimeout=2' + ' --IceStorm.Election.ElectionTimeout=2' + ' --IceStorm.Election.ResponseTimeout=2') diff --git a/cpp/test/IceStorm/stress/run.py b/cpp/test/IceStorm/stress/run.py index 4ce5c41f392..fc3d96eb8ca 100755 --- a/cpp/test/IceStorm/stress/run.py +++ b/cpp/test/IceStorm/stress/run.py @@ -83,10 +83,8 @@ def runAdmin(cmd, desc = None): def runtest(type): # Clear the idle timeout otherwise the IceBox ThreadPool will timeout. - server1 = IceStormUtil.init(toplevel, testdir, type, additional = '--Ice.ServerIdleTime=0', - dbDir = "db", instanceName = "TestIceStorm1", port = 12000) - server2 = IceStormUtil.init(toplevel, testdir, type, additional = '--Ice.ServerIdleTime=0', - dbDir = "db2", instanceName = "TestIceStorm2", port = 12500) + server1 = IceStormUtil.init(toplevel, testdir, type, dbDir = "db", instanceName = "TestIceStorm1", port = 12000) + server2 = IceStormUtil.init(toplevel, testdir, type, dbDir = "db2", instanceName = "TestIceStorm2", port = 12500) global adminIceStormReference adminIceStormReference = ' --IceStormAdmin.TopicManager.Proxy="%s" --IceStormAdmin.TopicManager.Proxy2="%s"' % ( server1.proxy(), server2.proxy()) |