Merge remote-tracking branch 'origin/3.6'

6 files changed, 20 insertions, 7 deletions

diff --git a/python/test/Ice/optional/Server.py b/python/test/Ice/optional/Server.py
index 6f1d9f2fdb7..bf4236de34d 100755
--- a/python/test/Ice/optional/Server.py
+++ b/python/test/Ice/optional/Server.py
@@ -139,7 +139,7 @@ class InitialI(Test.Initial):
         pass
 
     def returnOptionalClass(self, req, current=None):
-        return Test.OneOptional(5)
+        return Test.OneOptional(53)
 
     def opG(self, g, current=None):
         return g
@@ -156,6 +156,9 @@ class InitialI(Test.Initial):
     def supportsCsharpSerializable(self, current=None):
         return True
 
+    def supportsCppStringView(self, current=None):
+        return False
+
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
diff --git a/python/test/Ice/optional/ServerAMD.py b/python/test/Ice/optional/ServerAMD.py
index b3b913304e4..a300cf17e22 100755
--- a/python/test/Ice/optional/ServerAMD.py
+++ b/python/test/Ice/optional/ServerAMD.py
@@ -121,7 +121,7 @@ class InitialI(Test.Initial):
     def opVarStructSeq_async(self, cb, p1, current=None):
         cb.ice_response(p1, p1)
 
-    def opSerializable(self, cb, p1, current=None):
+    def opSerializable_async(self, cb, p1, current=None):
         cb.ice_response(p1, p1)
 
     def opIntIntDict_async(self, cb, p1, current=None):
@@ -140,7 +140,7 @@ class InitialI(Test.Initial):
         cb.ice_response()
 
     def returnOptionalClass_async(self, cb, req, current=None):
-        cb.ice_response(Test.OneOptional(5))
+        cb.ice_response(Test.OneOptional(53))
 
     def opG_async(self, cb, g, current=None):
         cb.ice_response(g)
@@ -151,11 +151,14 @@ class InitialI(Test.Initial):
     def supportsRequiredParams_async(self, cb, current=None):
         cb.ice_response(False)
 
-    def supportsJavaSerializable(self, cb, current=None):
+    def supportsJavaSerializable_async(self, cb, current=None):
         cb.ice_response(True)
 
-    def supportsCsharpSerializable(self, cb, current=None):
-        cb.ice_response(True)
+    def supportsCsharpSerializable_async(self, cb, current=None):
+        cb.ice_response(False)
+
+    def supportsCppStringView_async(self, cb, current=None):
+        cb.ice_response(False)
 
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
diff --git a/python/test/Ice/optional/Test.ice b/python/test/Ice/optional/Test.ice
index 025384c6ca8..73bfd77814c 100644
--- a/python/test/Ice/optional/Test.ice
+++ b/python/test/Ice/optional/Test.ice
@@ -289,6 +289,8 @@ class Initial
     bool supportsJavaSerializable();
 
     bool supportsCsharpSerializable();
+
+    bool supportsCppStringView();
 };
 
 };
diff --git a/python/test/Ice/optional/TestAMD.ice b/python/test/Ice/optional/TestAMD.ice
index 4b78e411c68..6510fcbcc5f 100644
--- a/python/test/Ice/optional/TestAMD.ice
+++ b/python/test/Ice/optional/TestAMD.ice
@@ -290,6 +290,8 @@ class Initial
     bool supportsJavaSerializable();
 
     bool supportsCsharpSerializable();
+
+    bool supportsCppStringView();
 };
 
 };
diff --git a/python/test/Ice/proxy/Server.py b/python/test/Ice/proxy/Server.py
index 9c3f7bb18d9..9c91f317da3 100755
--- a/python/test/Ice/proxy/Server.py
+++ b/python/test/Ice/proxy/Server.py
@@ -22,6 +22,7 @@ import Test, TestI
 def run(args, communicator):
     communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp")
     adapter = communicator.createObjectAdapter("TestAdapter")
+
     adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test"))
     adapter.activate()
     communicator.waitForShutdown()
@@ -30,6 +31,7 @@ def run(args, communicator):
 try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
+    initData.properties.setProperty("Ice.Warn.Dispatch", "0")
     communicator = Ice.initialize(sys.argv, initData)
     status = run(sys.argv, communicator)
 except:
diff --git a/python/test/Ice/proxy/ServerAMD.py b/python/test/Ice/proxy/ServerAMD.py
index 787ace9b443..028dfb55af7 100755
--- a/python/test/Ice/proxy/ServerAMD.py
+++ b/python/test/Ice/proxy/ServerAMD.py
@@ -48,7 +48,8 @@ def run(args, communicator):
 try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.Warn.Connections", "0");
+    initData.properties.setProperty("Ice.Warn.Connections", "0")
+    initData.properties.setProperty("Ice.Warn.Dispatch", "0")
     communicator = Ice.initialize(sys.argv, initData)
     status = run(sys.argv, communicator)
 except: