summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpp/test/Ice/timeout/Client.cpp6
-rw-r--r--cpp/test/Ice/timeout/Server.cpp6
-rw-r--r--csharp/test/Ice/timeout/Client.cs5
-rw-r--r--csharp/test/Ice/timeout/Server.cs6
-rw-r--r--java-compat/test/src/main/java/test/Ice/timeout/Client.java6
-rw-r--r--java-compat/test/src/main/java/test/Ice/timeout/Server.java6
-rw-r--r--java/test/src/main/java/test/Ice/timeout/Client.java6
-rw-r--r--java/test/src/main/java/test/Ice/timeout/Server.java6
-rw-r--r--js/test/Ice/hold/Client.js6
-rw-r--r--js/test/Ice/timeout/Client.js5
-rw-r--r--objective-c/test/Ice/timeout/Server.m6
-rw-r--r--php/test/Ice/timeout/Client.php5
-rwxr-xr-xpython/test/Ice/timeout/Client.py6
-rwxr-xr-xpython/test/Ice/timeout/Server.py7
-rwxr-xr-xruby/test/Ice/timeout/Client.rb6
15 files changed, 37 insertions, 51 deletions
diff --git a/cpp/test/Ice/timeout/Client.cpp b/cpp/test/Ice/timeout/Client.cpp
index 848f87d1e80..62ddac641b8 100644
--- a/cpp/test/Ice/timeout/Client.cpp
+++ b/cpp/test/Ice/timeout/Client.cpp
@@ -56,12 +56,6 @@ main(int argc, char* argv[])
initData.properties->setProperty("Ice.Warn.Connections", "0");
//
- // We need to send messages large enough to cause the transport
- // buffers to fill up.
- //
- initData.properties->setProperty("Ice.MessageSizeMax", "20000");
-
- //
// Limit the send buffer size, this test relies on the socket
// send() blocking after sending a given amount of data.
//
diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp
index b52247d2463..8922a336669 100644
--- a/cpp/test/Ice/timeout/Server.cpp
+++ b/cpp/test/Ice/timeout/Server.cpp
@@ -55,6 +55,12 @@ main(int argc, char* argv[])
initData.properties->setProperty("Ice.Warn.Connections", "0");
//
+ // The client sends large messages to cause the transport
+ // buffers to fill up.
+ //
+ initData.properties->setProperty("Ice.MessageSizeMax", "20000");
+
+ //
// Limit the recv buffer size, this test relies on the socket
// send() blocking after sending a given amount of data.
//
diff --git a/csharp/test/Ice/timeout/Client.cs b/csharp/test/Ice/timeout/Client.cs
index ac0f0946eb5..4d74eb69a40 100644
--- a/csharp/test/Ice/timeout/Client.cs
+++ b/csharp/test/Ice/timeout/Client.cs
@@ -28,11 +28,6 @@ public class Client : TestCommon.Application
protected override Ice.InitializationData getInitData(ref string[] args)
{
Ice.InitializationData initData = base.getInitData(ref args);
- //
- // We need to send messages large enough to cause the transport
- // buffers to fill up.
- //
- initData.properties.setProperty("Ice.MessageSizeMax", "20000");
//
// For this test, we want to disable retries.
diff --git a/csharp/test/Ice/timeout/Server.cs b/csharp/test/Ice/timeout/Server.cs
index 088bd469366..1db43419a87 100644
--- a/csharp/test/Ice/timeout/Server.cs
+++ b/csharp/test/Ice/timeout/Server.cs
@@ -38,6 +38,12 @@ public class Server : TestCommon.Application
initData.properties.setProperty("Ice.Warn.Connections", "0");
//
+ // The client sends large messages to cause the transport
+ // buffers to fill up.
+ //
+ initData.properties.setProperty("Ice.MessageSizeMax", "20000");
+
+ //
// Limit the recv buffer size, this test relies on the socket
// send() blocking after sending a given amount of data.
//
diff --git a/java-compat/test/src/main/java/test/Ice/timeout/Client.java b/java-compat/test/src/main/java/test/Ice/timeout/Client.java
index 3e4c3075007..872ee198bf3 100644
--- a/java-compat/test/src/main/java/test/Ice/timeout/Client.java
+++ b/java-compat/test/src/main/java/test/Ice/timeout/Client.java
@@ -28,12 +28,6 @@ public class Client extends test.Util.Application
initData.properties.setProperty("Ice.Package.Test", "test.Ice.timeout");
//
- // We need to send messages large enough to cause the transport
- // buffers to fill up.
- //
- initData.properties.setProperty("Ice.MessageSizeMax", "20000");
-
- //
// For this test, we want to disable retries.
//
initData.properties.setProperty("Ice.RetryIntervals", "-1");
diff --git a/java-compat/test/src/main/java/test/Ice/timeout/Server.java b/java-compat/test/src/main/java/test/Ice/timeout/Server.java
index 0e3c34187a2..dcdacd5a222 100644
--- a/java-compat/test/src/main/java/test/Ice/timeout/Server.java
+++ b/java-compat/test/src/main/java/test/Ice/timeout/Server.java
@@ -34,6 +34,12 @@ public class Server extends test.Util.Application
initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
//
+ // The client sends large messages to cause the transport
+ // buffers to fill up.
+ //
+ initData.properties.setProperty("Ice.MessageSizeMax", "20000");
+
+ //
// This test kills connections, so we don't want warnings.
//
initData.properties.setProperty("Ice.Warn.Connections", "0");
diff --git a/java/test/src/main/java/test/Ice/timeout/Client.java b/java/test/src/main/java/test/Ice/timeout/Client.java
index e8d6ed5926d..632535964b9 100644
--- a/java/test/src/main/java/test/Ice/timeout/Client.java
+++ b/java/test/src/main/java/test/Ice/timeout/Client.java
@@ -28,12 +28,6 @@ public class Client extends test.Util.Application
initData.properties.setProperty("Ice.Package.Test", "test.Ice.timeout");
//
- // We need to send messages large enough to cause the transport
- // buffers to fill up.
- //
- initData.properties.setProperty("Ice.MessageSizeMax", "20000");
-
- //
// For this test, we want to disable retries.
//
initData.properties.setProperty("Ice.RetryIntervals", "-1");
diff --git a/java/test/src/main/java/test/Ice/timeout/Server.java b/java/test/src/main/java/test/Ice/timeout/Server.java
index fb028efe97e..71a555dbb6f 100644
--- a/java/test/src/main/java/test/Ice/timeout/Server.java
+++ b/java/test/src/main/java/test/Ice/timeout/Server.java
@@ -34,6 +34,12 @@ public class Server extends test.Util.Application
initData.properties.setProperty("Ice.TCP.RcvSize", "50000");
//
+ // The client sends large messages to cause the transport
+ // buffers to fill up.
+ //
+ initData.properties.setProperty("Ice.MessageSizeMax", "20000");
+
+ //
// This test kills connections, so we don't want warnings.
//
initData.properties.setProperty("Ice.Warn.Connections", "0");
diff --git a/js/test/Ice/hold/Client.js b/js/test/Ice/hold/Client.js
index 6b301c16014..265a640ffb1 100644
--- a/js/test/Ice/hold/Client.js
+++ b/js/test/Ice/hold/Client.js
@@ -329,12 +329,6 @@
//
id.properties.setProperty("Ice.Warn.Connections", "0");
- //
- // We need to send messages large enough to cause the transport
- // buffers to fill up.
- //
- id.properties.setProperty("Ice.MessageSizeMax", "10000");
-
id.properties.setProperty("Ice.RetryIntervals", "-1");
var c = Ice.initialize(id);
diff --git a/js/test/Ice/timeout/Client.js b/js/test/Ice/timeout/Client.js
index 66681631a8c..0cb0b006b72 100644
--- a/js/test/Ice/timeout/Client.js
+++ b/js/test/Ice/timeout/Client.js
@@ -341,11 +341,6 @@
//
id.properties.setProperty("Ice.Warn.Connections", "0");
- //
- // We need to send messages large enough to cause the transport
- // buffers to fill up.
- //
- id.properties.setProperty("Ice.MessageSizeMax", "10000");
id.properties.setProperty("Ice.PrintStackTraces", "1");
var c = Ice.initialize(id);
diff --git a/objective-c/test/Ice/timeout/Server.m b/objective-c/test/Ice/timeout/Server.m
index 06b96f9a031..a2e002db7dd 100644
--- a/objective-c/test/Ice/timeout/Server.m
+++ b/objective-c/test/Ice/timeout/Server.m
@@ -63,6 +63,12 @@ main(int argc, char* argv[])
[initData.properties setProperty:@"Ice.Warn.Connections" value:@"0"];
//
+ // The client sends large messages to cause the transport
+ // buffers to fill up.
+ //
+ [initData.properties setProperty:@"Ice.MessageSizeMax" value:@"20000"];
+
+ //
// Limit the send buffer size, this test relies on the socket
// send() blocking after sending a given amount of data.
//
diff --git a/php/test/Ice/timeout/Client.php b/php/test/Ice/timeout/Client.php
index 865748938d2..93a136ebb47 100644
--- a/php/test/Ice/timeout/Client.php
+++ b/php/test/Ice/timeout/Client.php
@@ -403,11 +403,6 @@ function allTests($communicator)
$initData = eval($NS ? "return new Ice\\InitializationData();" : "return new Ice_InitializationData();");
$initData->properties = eval($NS ? "return Ice\\createProperties(\$argv);" : "return Ice_createProperties(\$argv);");
-//
-// We need to send messages large enough to cause the transport
-// buffers to fill up.
-//
-$initData->properties->setProperty("Ice.MessageSizeMax", "20000");
//
// For this test, we want to disable retries.
diff --git a/python/test/Ice/timeout/Client.py b/python/test/Ice/timeout/Client.py
index 2e1a5dbf3bd..9d6bd83e625 100755
--- a/python/test/Ice/timeout/Client.py
+++ b/python/test/Ice/timeout/Client.py
@@ -37,12 +37,6 @@ try:
initData.properties = Ice.createProperties(sys.argv)
#
- # We need to send messages large enough to cause the transport
- # buffers to fill up.
- #
- initData.properties.setProperty("Ice.MessageSizeMax", "10000");
-
- #
# For this test, we want to disable retries.
#
initData.properties.setProperty("Ice.RetryIntervals", "-1");
diff --git a/python/test/Ice/timeout/Server.py b/python/test/Ice/timeout/Server.py
index cde7d51ee98..917f8e90017 100755
--- a/python/test/Ice/timeout/Server.py
+++ b/python/test/Ice/timeout/Server.py
@@ -60,6 +60,13 @@ try:
initData = Ice.InitializationData()
initData.properties = Ice.createProperties(sys.argv)
initData.properties.setProperty("Ice.Warn.Connections", "0");
+
+ #
+ # The client sends large messages to cause the transport
+ # buffers to fill up.
+ #
+ initData.properties.setProperty("Ice.MessageSizeMax", "10000");
+
#
# Limit the recv buffer size, this test relies on the socket
# send() blocking after sending a given amount of data.
diff --git a/ruby/test/Ice/timeout/Client.rb b/ruby/test/Ice/timeout/Client.rb
index 809dc568e0c..452ae4f47e5 100755
--- a/ruby/test/Ice/timeout/Client.rb
+++ b/ruby/test/Ice/timeout/Client.rb
@@ -40,12 +40,6 @@ begin
initData.properties = Ice.createProperties(ARGV)
#
- # We need to send messages large enough to cause the transport
- # buffers to fill up.
- #
- initData.properties.setProperty("Ice.MessageSizeMax", "10000");
-
- #
# For this test, we want to disable retries.
#
initData.properties.setProperty('Ice.RetryIntervals', '-1')