ICE-7241 - Python Ice/optional cross test failure

4 files changed, 16 insertions, 6 deletions

diff --git a/python/test/Ice/optional/Server.py b/python/test/Ice/optional/Server.py
index eba7e7ccad6..6d0a280169a 100755
--- a/python/test/Ice/optional/Server.py
+++ b/python/test/Ice/optional/Server.py
@@ -136,7 +136,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
@@ -153,6 +153,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 97ae0ce268e..0f42e827343 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):
@@ -137,7 +137,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)
@@ -148,11 +148,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 503483b5c1a..af85be2c2b2 100644
--- a/python/test/Ice/optional/Test.ice
+++ b/python/test/Ice/optional/Test.ice
@@ -286,6 +286,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 ae7a8a57dab..247915c4623 100644
--- a/python/test/Ice/optional/TestAMD.ice
+++ b/python/test/Ice/optional/TestAMD.ice
@@ -287,6 +287,8 @@ class Initial
     bool supportsJavaSerializable();
 
     bool supportsCsharpSerializable();
+
+    bool supportsCppStringView();
 };
 
 };