Removed Ice.MessageSizeMax from clients where it's no longer necessary (ICE-8340)

14 files changed, 8 insertions, 17 deletions

diff --git a/cpp/test/Ice/background/Client.cpp b/cpp/test/Ice/background/Client.cpp
index 4daa3fe7572..0c0bf3d3c67 100644
--- a/cpp/test/Ice/background/Client.cpp
+++ b/cpp/test/Ice/background/Client.cpp
@@ -60,8 +60,6 @@ main(int argc, char* argv[])
         //
         initData.properties->setProperty("Ice.Warn.Connections", "0");
 
-        initData.properties->setProperty("Ice.MessageSizeMax", "50000");
-
         // This test relies on filling the TCP send/recv buffer, so
         // we rely on a fixed value for these buffers.
         initData.properties->setProperty("Ice.TCP.SndSize", "50000");
diff --git a/cpp/test/Ice/metrics/Client.cpp b/cpp/test/Ice/metrics/Client.cpp
index 77b498ed021..306a8673f90 100644
--- a/cpp/test/Ice/metrics/Client.cpp
+++ b/cpp/test/Ice/metrics/Client.cpp
@@ -40,7 +40,6 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.Admin.InstanceName", "client");
         initData.properties->setProperty("Ice.Admin.DelayCreation", "1");
         initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.MessageSizeMax", "50000");
         CommunicatorObserverIPtr observer = ICE_MAKE_SHARED(CommunicatorObserverI);
         initData.observer = observer;
         Ice::CommunicatorHolder ich(argc, argv, initData);
diff --git a/cpp/test/Ice/metrics/Collocated.cpp b/cpp/test/Ice/metrics/Collocated.cpp
index 45ecb026590..5f551f53299 100644
--- a/cpp/test/Ice/metrics/Collocated.cpp
+++ b/cpp/test/Ice/metrics/Collocated.cpp
@@ -51,7 +51,6 @@ main(int argc, char* argv[])
         initData.properties->setProperty("Ice.Admin.DelayCreation", "1");
         initData.properties->setProperty("Ice.Warn.Connections", "0");
         initData.properties->setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties->setProperty("Ice.MessageSizeMax", "50000");
         CommunicatorObserverIPtr observer = ICE_MAKE_SHARED(CommunicatorObserverI);
         initData.observer = observer;
         Ice::CommunicatorHolder ich(argc, argv, initData);
diff --git a/csharp/test/Ice/background/Client.cs b/csharp/test/Ice/background/Client.cs
index 3778b3255ef..8d5da20fb64 100644
--- a/csharp/test/Ice/background/Client.cs
+++ b/csharp/test/Ice/background/Client.cs
@@ -41,8 +41,6 @@ public class Client : TestCommon.Application
         //
         initData.properties.setProperty("Ice.Warn.Connections", "0");
 
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
-
         // This test relies on filling the TCP send/recv buffer, so
         // we rely on a fixed value for these buffers.
         initData.properties.setProperty("Ice.TCP.SndSize", "50000");
diff --git a/csharp/test/Ice/metrics/Client.cs b/csharp/test/Ice/metrics/Client.cs
index 7b2beec0a9e..f7018a83421 100644
--- a/csharp/test/Ice/metrics/Client.cs
+++ b/csharp/test/Ice/metrics/Client.cs
@@ -34,7 +34,6 @@ public class Client : TestCommon.Application
         initData.properties.setProperty("Ice.Admin.InstanceName", "client");
         initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
         initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
 
         // TODO: WORKAROUND: .NET connection closure is sometime not detected in a timely fashion
diff --git a/csharp/test/Ice/metrics/Collocated.cs b/csharp/test/Ice/metrics/Collocated.cs
index 9f872ca7632..331b8fcac94 100644
--- a/csharp/test/Ice/metrics/Collocated.cs
+++ b/csharp/test/Ice/metrics/Collocated.cs
@@ -46,7 +46,6 @@ public class Collocated : TestCommon.Application
         initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
         initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
 
         // TODO: WORKAROUND: .NET connection closure is sometime not detected in a timely fashion
diff --git a/java-compat/test/src/main/java/test/Ice/background/Client.java b/java-compat/test/src/main/java/test/Ice/background/Client.java
index ebb57208d40..624c891abb2 100644
--- a/java-compat/test/src/main/java/test/Ice/background/Client.java
+++ b/java-compat/test/src/main/java/test/Ice/background/Client.java
@@ -36,7 +36,6 @@ public class Client extends test.Util.Application
         // This test kills connections, so we don't want warnings.
         //
         initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
 
         // This test relies on filling the TCP send/recv buffer, so
         // we rely on a fixed value for these buffers.
diff --git a/java-compat/test/src/main/java/test/Ice/metrics/Client.java b/java-compat/test/src/main/java/test/Ice/metrics/Client.java
index fee7e61a1e7..50fb2814c3f 100644
--- a/java-compat/test/src/main/java/test/Ice/metrics/Client.java
+++ b/java-compat/test/src/main/java/test/Ice/metrics/Client.java
@@ -40,7 +40,6 @@ public class Client extends test.Util.Application
         initData.properties.setProperty("Ice.Admin.InstanceName", "client");
         initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
         initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
 
         initData.observer = _observer;
diff --git a/java-compat/test/src/main/java/test/Ice/metrics/Collocated.java b/java-compat/test/src/main/java/test/Ice/metrics/Collocated.java
index 3257afbc42c..88775951d73 100644
--- a/java-compat/test/src/main/java/test/Ice/metrics/Collocated.java
+++ b/java-compat/test/src/main/java/test/Ice/metrics/Collocated.java
@@ -59,7 +59,6 @@ public class Collocated extends test.Util.Application
         initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
         initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
         initData.observer = _observer;
         return initData;
diff --git a/java/test/src/main/java/test/Ice/background/Client.java b/java/test/src/main/java/test/Ice/background/Client.java
index 13941aa31cb..dc63096560c 100644
--- a/java/test/src/main/java/test/Ice/background/Client.java
+++ b/java/test/src/main/java/test/Ice/background/Client.java
@@ -36,7 +36,6 @@ public class Client extends test.Util.Application
         // This test kills connections, so we don't want warnings.
         //
         initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
 
         // This test relies on filling the TCP send/recv buffer, so
         // we rely on a fixed value for these buffers.
diff --git a/java/test/src/main/java/test/Ice/metrics/Client.java b/java/test/src/main/java/test/Ice/metrics/Client.java
index 76109ab0b08..20cfb0c2f53 100644
--- a/java/test/src/main/java/test/Ice/metrics/Client.java
+++ b/java/test/src/main/java/test/Ice/metrics/Client.java
@@ -39,7 +39,6 @@ public class Client extends test.Util.Application
         initData.properties.setProperty("Ice.Admin.InstanceName", "client");
         initData.properties.setProperty("Ice.Admin.DelayCreation", "1");
         initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
         initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
 
         initData.observer = _observer;
diff --git a/java/test/src/main/java/test/Ice/metrics/Collocated.java b/java/test/src/main/java/test/Ice/metrics/Collocated.java
index 32d2847a253..bf67631cc47 100644
--- a/java/test/src/main/java/test/Ice/metrics/Collocated.java
+++ b/java/test/src/main/java/test/Ice/metrics/Collocated.java
@@ -59,7 +59,6 @@ public class Collocated extends test.Util.Application
         initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
         initData.properties.setProperty("Ice.Warn.Connections", "0");
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
         initData.properties.setProperty("Ice.Default.Host", "127.0.0.1");
         initData.observer = _observer;
         return initData;
diff --git a/objective-c/test/Ice/metrics/Client.m b/objective-c/test/Ice/metrics/Client.m
index 1736d9c8023..a6f568b72e1 100644
--- a/objective-c/test/Ice/metrics/Client.m
+++ b/objective-c/test/Ice/metrics/Client.m
@@ -48,7 +48,6 @@ main(int argc, char* argv[])
             [initData.properties setProperty:@"Ice.Admin.InstanceName" value:@"client"];
             [initData.properties setProperty:@"Ice.Admin.DelayCreation" value:@"1"];
             [initData.properties setProperty:@"Ice.Warn.Connections" value:@"0"];
-            [initData.properties setProperty:@"Ice.MessageSizeMax" value:@"50000"];
 
             [initData.properties setProperty:@"IceMX.Metrics.Debug.GroupBy" value:@"id"];
             [initData.properties setProperty:@"IceMX.Metrics.Parent.GroupBy" value:@"parent"];
diff --git a/scripts/tests/Ice/metrics.py b/scripts/tests/Ice/metrics.py
index d2ece8de332..35b3634f074 100644
--- a/scripts/tests/Ice/metrics.py
+++ b/scripts/tests/Ice/metrics.py
@@ -14,8 +14,14 @@ traceProps = {
     "Ice.Trace.Retry" : 1,
     "Ice.Trace.Protocol" : 1
 }
+testcases = [
+    ClientServerTestCase(traceProps=traceProps),
+]
+if Mapping.getByPath(__name__).hasSource("Ice/metrics", "serveramd"):
+    testcases += [ ClientAMDServerTestCase(traceProps=traceProps) ]
+if Mapping.getByPath(__name__).hasSource("Ice/metrics", "collocated"):
+    testcases += [ CollocatedTestCase(traceProps=traceProps) ]
 
-TestSuite(__name__,
-          [ClientServerTestCase(traceProps=traceProps)],
+TestSuite(__name__, testcases,
           options = { "ipv6" : [False], "compress": [False], "protocol" : ["tcp", "ssl"] },
           multihost=False)